diff options
6 files changed, 37 insertions, 34 deletions
diff --git a/.gitignore b/.gitignore index 685344bb21..44a1b8107b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.ctxt # IDEA files +.idea/ *.iml *.ipr *.iws diff --git a/gradle.properties b/gradle.properties index ff2f1c8178..8f238432bb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ systemProp.org.gradle.internal.http.connectionTimeout=120000 systemProp.org.gradle.internal.http.socketTimeout=120000 majorUpdate=0 minorUpdate=5 -buildNumber=18 +buildNumber=19 apiVersion=11 ic2Version=2.2.828-experimental applecoreVersion=1.7.10-3.1.1 diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java index 6d9b140e44..8db536319a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CircuitAssemblyLine.java @@ -306,21 +306,6 @@ public class GT_TileEntity_CircuitAssemblyLine extends GT_MetaTileEntity_MultiBl } @Override - public boolean addOutputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (aTileEntity == null) { - return false; - } else { - IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus && ((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity).mTier == 0) { - ((GT_MetaTileEntity_Hatch)aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus)aMetaTileEntity); - } else { - return false; - } - } - } - - @Override public int getMaxEfficiency(ItemStack itemStack) { return 10000; } @@ -348,7 +333,7 @@ public class GT_TileEntity_CircuitAssemblyLine extends GT_MetaTileEntity_MultiBl private static final String[] DESCRIPTION = new String[]{ "Circuit Assembly Line", "Size(WxHxD): (2-7)x3x3, variable length", "Bottom: Steel Machine Casing(or 1x Maintenance or Input Hatch),", - "ULV Input Bus (Last ULV Output Bus), Steel Machine Casing", + "ULV Input Bus (Last Output Bus), Steel Machine Casing", "Middle: EV+ Tier Glass, Assembling Line Casing, EV+ Tier Glass", "Top: Grate Machine Casing (or Controller or 1x Energy Hatch)", "Up to 7 repeating slices, last is Output Bus", diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java index d63bff14dc..99164f0510 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java @@ -191,8 +191,9 @@ public class WerkstoffLoader { } //TODO: - //FREE ID RANGE: 10_001-28_998 + //FREE ID RANGE: 11_000-28_998 //bartimaeusnek reserved 0-10_000 + //GlodBlock reserved range 10_001-10_999 //bot reserved range 29_899-29_999 //Tec & basdxz reserved range 30_000-31_000 //GT Material range reserved on 31_767-32_767 @@ -1864,4 +1865,4 @@ public class WerkstoffLoader { GT_OreDictUnificator.registerOre("craftingIndustrialDiamond", WerkstoffLoader.CubicZirconia.get(gemExquisite)); } -}
\ No newline at end of file +} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java index 295bfd144c..119b04bb9e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java @@ -73,7 +73,7 @@ public class MoltenCellLoader implements IWerkstoffRunnable { //Tank "Recipe" final FluidContainerRegistry.FluidContainerData data = new FluidContainerRegistry.FluidContainerData(new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), werkstoff.get(WerkstoffLoader.cellMolten), Materials.Empty.getCells(1)); - FluidContainerRegistry.registerFluidContainer(werkstoff.getMolten(144), werkstoff.get(cell), Materials.Empty.getCells(1)); + FluidContainerRegistry.registerFluidContainer(werkstoff.getMolten(144), werkstoff.get(WerkstoffLoader.cellMolten), Materials.Empty.getCells(1)); GT_Utility.addFluidContainerData(data); GT_Values.RA.addFluidCannerRecipe(Materials.Empty.getCells(1), werkstoff.get(WerkstoffLoader.cellMolten), new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144), GT_Values.NF); GT_Values.RA.addFluidCannerRecipe(werkstoff.get(WerkstoffLoader.cellMolten), Materials.Empty.getCells(1), GT_Values.NF, new FluidStack(Objects.requireNonNull(WerkstoffLoader.molten.get(werkstoff)), 144)); diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java index 0c11947028..267f9d372e 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticgreg/GT_TileEntity_VoidMiner_Base.java @@ -49,6 +49,7 @@ import gregtech.common.GT_Worldgen_GT_Ore_SmallPieces; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_DrillerBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; import net.minecraft.world.gen.ChunkProviderServer; import net.minecraftforge.fluids.FluidStack; @@ -174,31 +175,46 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri } private Predicate<GT_Worldgen_GT_Ore_Layer> makeOreLayerPredicate() { - switch (this.getBaseMetaTileEntity().getWorld().provider.dimensionId) { + World world = this.getBaseMetaTileEntity().getWorld(); + switch (world.provider.dimensionId) { case -1: return gt_worldgen -> gt_worldgen.mNether; case 0: return gt_worldgen -> gt_worldgen.mOverworld; case 1: return gt_worldgen -> gt_worldgen.mEnd || gt_worldgen.mEndAsteroid; + case 7: + /* + explicitely giving different dim numbers so it default to false in the config, keeping compat + with the current worldgen config + */ + + return gt_worldgen -> gt_worldgen.isGenerationAllowed(world, 0, 7); default: throw new IllegalStateException(); } } - + private Predicate<GT_Worldgen_GT_Ore_SmallPieces> makeSmallOresPredicate() { - switch (this.getBaseMetaTileEntity().getWorld().provider.dimensionId) { + World world = this.getBaseMetaTileEntity().getWorld(); + switch (world.provider.dimensionId) { case -1: return gt_worldgen -> gt_worldgen.mNether; case 0: return gt_worldgen -> gt_worldgen.mOverworld; case 1: return gt_worldgen -> gt_worldgen.mEnd; + case 7: + /* + explicitely giving different dim numbers so it default to false in the config, keeping compat + with the current worldgen config + */ + return gt_worldgen -> gt_worldgen.isGenerationAllowed(world, 0, 7); default: throw new IllegalStateException(); } } - + private void getDropsVanillaVeins(Predicate<GT_Worldgen_GT_Ore_Layer> oreLayerPredicate) { GT_Worldgen_GT_Ore_Layer.sList.stream().filter(gt_worldgen -> gt_worldgen.mEnabled && oreLayerPredicate.test(gt_worldgen)).forEach(element -> { dropmap.put(new Pair<>((int) element.mPrimaryMeta,false), (float) element.mWeight); @@ -214,17 +230,17 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri dropmap.put(new Pair<>((int) element.mMeta,false), (float) element.mAmount) ); } - + private void getDropMapVanilla() { getDropsVanillaVeins(makeOreLayerPredicate()); getDropsVanillaSmallOres(makeSmallOresPredicate()); } - + private void getDropMapSpace(ModDimensionDef finalDef) { getDropsOreVeinsSpace(finalDef); getDropsSmallOreSpace(finalDef); } - + private void getDropsOreVeinsSpace(ModDimensionDef finalDef) { Set space = GalacticGreg.oreVeinWorldgenList.stream() .filter(gt_worldgen -> gt_worldgen.mEnabled && gt_worldgen instanceof GT_Worldgen_GT_Ore_Layer_Space && ((GT_Worldgen_GT_Ore_Layer_Space) gt_worldgen).isEnabledForDim(finalDef)) @@ -292,7 +308,7 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri if (storedNobleGas == null || !consumeNobleGas(storedNobleGas)) multiplier = TIER_MULTIPLIER; } - + private void getDropMapBartworks(ModDimensionDef finalDef, int aID) { Consumer<BW_OreLayer> addToList = makeAddToList(); if (aID == ConfigHandler.ross128BID) @@ -316,7 +332,7 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri } }; } - + private ModDimensionDef makeModDimDef() { return getModContainers().stream() .flatMap(modContainer -> modContainer.getDimensionList().stream()) @@ -324,7 +340,7 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri .equals(((ChunkProviderServer) this.getBaseMetaTileEntity().getWorld().getChunkProvider()).currentChunkProvider.getClass().getName())) .findFirst().orElse(null); } - + private void addOresVeinsBartworks(ModDimensionDef finalDef, Consumer<BW_OreLayer> addToList) { try { Set space = GalacticGreg.oreVeinWorldgenList.stream() @@ -334,7 +350,7 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri space.forEach(addToList); } catch (NullPointerException ignored) {} } - + private void addSmallOresBartworks(ModDimensionDef finalDef) { try { Set space = GalacticGreg.smallOreWorldgenList.stream() @@ -347,7 +363,7 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri ); } catch (NullPointerException ignored) {} } - + private void handleExtraDrops(int id) { Optional.ofNullable(getExtraDropsDimMap().get(id)).ifPresent(e -> e.forEach(f -> dropmap.put(f.getKey(), f.getValue()))); } @@ -363,7 +379,7 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri } private void handleModDimDef(int id) { - if (id <= 1 && id >= -1) + if ((id <= 1 && id >= -1) || id == 7) getDropMapVanilla(); Optional.ofNullable(makeModDimDef()).ifPresent(def -> { handleDimBasedDrops(def, id); @@ -381,7 +397,7 @@ public abstract class GT_TileEntity_VoidMiner_Base extends GT_MetaTileEntity_Dri private void makeDropMap() { if (dropmap == null || totalWeight == 0) - calculateDropMap(); + calculateDropMap(); } private void handleOutputs() { |