-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* DummyModule is fucked, gave up for now ffs * I hate this multiblock * StarLadder Works, Modules do not * 1 * WorkableSteamHullType Renderer, IPBF, LMV * Fireclay, IPBF, Hardened Resin * Update GT to 1.4.4 * changelogs
- Loading branch information
1 parent
f8c3928
commit 24509b7
Showing
48 changed files
with
1,282 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| # Cosmic Core 0.3.7 | ||
| * Stellar Iris Dev Progress pt1 | ||
| * Thermia Implementations pt1 | ||
| * Perpetuity for QB rewards | ||
| # Cosmic Core 0.3.8 | ||
| * Updated to GTCEU 1.4.4 | ||
| * New Steam Machines | ||
| * Misc Fixes | ||
|
|
||
| # DO NOT MANUALLY UPDATE COSMIC CORE FOR FRONTIERS 0.5.2 **I WILL NOT WORK** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/cosmiccore/models/item/fireclay_ball.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "cosmiccore:item/fireclay_ball" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/cosmiccore/models/item/hardened_resin.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "cosmiccore:item/hardened_resin" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 8 additions & 2 deletions
10
src/main/java/com/ghostipedia/cosmiccore/api/CosmicCoreAPI.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,20 @@ | ||
| package com.ghostipedia.cosmiccore.api; | ||
|
|
||
| import com.ghostipedia.cosmiccore.api.block.IMagnetType; | ||
| import com.ghostipedia.cosmiccore.api.block.IMultiblockProvider; | ||
| import com.ghostipedia.cosmiccore.common.block.MagnetBlock; | ||
| import com.gregtechceu.gtceu.api.block.ICoilType; | ||
| import com.gregtechceu.gtceu.common.block.CoilBlock; | ||
| import com.gregtechceu.gtceu.api.block.IFilterType; | ||
| import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine; | ||
| import net.minecraft.nbt.Tag; | ||
| import net.minecraft.world.level.block.Block; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.function.Supplier; | ||
|
|
||
| public class CosmicCoreAPI { | ||
| public static final Map<IMagnetType, Supplier<MagnetBlock>> MAGNET_COILS = new HashMap<>(); | ||
| public static final Map<Block, Supplier<Block>> STARLADDER_CASINGS = new HashMap<>(); | ||
| public static final Map<IMultiblockProvider, Supplier<Block>> STARLADDER_MODULES = new HashMap<>(); | ||
|
|
||
| } |
14 changes: 14 additions & 0 deletions
14
src/main/java/com/ghostipedia/cosmiccore/api/block/IMultiblockProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package com.ghostipedia.cosmiccore.api.block; | ||
|
|
||
| import com.gregtechceu.gtceu.api.capability.IEnergyContainer; | ||
| import com.gregtechceu.gtceu.api.machine.feature.IMachineFeature; | ||
|
|
||
| public interface IMultiblockProvider { | ||
|
|
||
| int getModulatorTier(); | ||
|
|
||
| IEnergyContainer getEnergyContainersForModules(); | ||
|
|
||
| boolean amIAModule(IMultiblockProvider receiver); | ||
|
|
||
| } |
18 changes: 18 additions & 0 deletions
18
src/main/java/com/ghostipedia/cosmiccore/api/block/IMultiblockReciever.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package com.ghostipedia.cosmiccore.api.block; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| public interface IMultiblockReciever { | ||
|
|
||
| @Nullable | ||
| IMultiblockProvider getModularMultiBlock(); | ||
|
|
||
| void setModularMultiBlock(IMultiblockProvider provider); | ||
|
|
||
| void sendWorkingDisabled(); | ||
|
|
||
| void sendWorkingEnabled(); | ||
|
|
||
| String getNameForDisplays(); | ||
|
|
||
| } |
10 changes: 7 additions & 3 deletions
10
...miccore/api/data/CosmicCoreTagPrefix.java → ...cosmiccore/api/data/CosmicCustomTags.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.