Compare commits

..
13 Commits
14 changed files with 53 additions and 57 deletions

No files matched your search

+13 -13
View File
@@ -2,23 +2,23 @@
dependencies {
api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.90-GTNH:dev')
api("com.github.GTNewHorizons:GTNHLib:0.6.39:dev")
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.14:dev')
compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev')
api("com.github.GTNewHorizons:GTNHLib:0.6.38:dev")
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:dev')
api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
shadowImplementation('cglib:cglib-nodep:3.3.0')
api("com.github.GTNewHorizons:TinkersConstruct:1.13.54-GTNH:dev")
api("com.github.GTNewHorizons:TinkersConstruct:1.13.40-GTNH:dev")
compileOnly('com.github.GTNewHorizons:waila:1.8.14:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-689-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:waila:1.8.12:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-660-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.464:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.18-1.7.10:dev") {transitive = false}
compileOnly('com.github.GTNewHorizons:Railcraft:9.16.33:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.7-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Chisel:2.16.13-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.19-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.395:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.16-1.7.10:dev") {transitive = false}
compileOnly('com.github.GTNewHorizons:Railcraft:9.16.30:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.5-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Chisel:2.16.5-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.16-GTNH:api') {transitive = false}
compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
@@ -26,5 +26,5 @@ dependencies {
compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta56:api') {transitive = false}
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta50:api') {transitive = false}
}
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41'
}
@@ -160,6 +160,7 @@ public class BlockConduitBundle extends BlockEio
BlockConduitBundle result = new BlockConduitBundle();
result.init();
MinecraftForge.EVENT_BUS.register(result.handler);
return result;
}
@@ -170,6 +171,7 @@ public class BlockConduitBundle extends BlockEio
private IIcon lastRemovedComponetIcon = null;
private final Random rand = new Random();
public EventHandler handler;
protected BlockConduitBundle() {
super(ModObject.blockConduitBundle.unlocalisedName, TileConduitBundle.class);
@@ -189,6 +191,8 @@ public class BlockConduitBundle extends BlockEio
return "EnderIO:" + soundName + ".step";
}
};
handler = new EventHandler();
}
@SideOnly(Side.CLIENT)
@@ -298,7 +302,6 @@ public class BlockConduitBundle extends BlockEio
EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), this);
}
EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR, this);
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
@Override
@@ -1231,7 +1234,6 @@ public class BlockConduitBundle extends BlockEio
if ("silence.step".equals(path)) {
ISound snd = event.sound;
World world = EnderIO.proxy.getClientWorld();
if (world == null) return;
BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF());
TileEntity te = bc.getTileEntity(world);
if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {
@@ -43,6 +43,8 @@ import crazypants.enderio.machine.farm.farmers.TreeHarvestUtil;
public class ItemDarkSteelAxe extends ItemAxe
implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem {
public EventHandler handler;
public static boolean isEquipped(EntityPlayer player) {
if (player == null) {
return false;
@@ -67,6 +69,7 @@ public class ItemDarkSteelAxe extends ItemAxe
public static ItemDarkSteelAxe create() {
ItemDarkSteelAxe res = new ItemDarkSteelAxe();
MinecraftForge.EVENT_BUS.register(res.handler);
res.init();
return res;
}
@@ -77,6 +80,7 @@ public class ItemDarkSteelAxe extends ItemAxe
protected ItemDarkSteelAxe() {
this("darkSteel", ItemDarkSteelSword.MATERIAL);
handler = new EventHandler();
}
protected ItemDarkSteelAxe(String name, ToolMaterial mat) {
@@ -86,6 +90,7 @@ public class ItemDarkSteelAxe extends ItemAxe
String str = name + "_axe";
setUnlocalizedName(str);
setTextureName(EnderIO.DOMAIN + ":" + str);
handler = new EventHandler();
}
@Override
@@ -245,7 +250,6 @@ public class ItemDarkSteelAxe extends ItemAxe
protected void init() {
GameRegistry.registerItem(this, getUnlocalizedName());
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
@Override
@@ -38,6 +38,8 @@ import crazypants.enderio.machine.farm.farmers.HarvestResult;
public class ItemDarkSteelShears extends ItemShears
implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem {
public EventHandler handler;
public static boolean isEquipped(EntityPlayer player) {
if (player == null) {
return false;
@@ -62,12 +64,13 @@ public class ItemDarkSteelShears extends ItemShears
public static ItemDarkSteelShears create() {
ItemDarkSteelShears res = new ItemDarkSteelShears();
MinecraftForge.EVENT_BUS.register(res.handler);
res.init();
return res;
}
private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
private final EntityComparator entityComparator = new EntityComparator();
protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
protected final EntityComparator entityComparator = new EntityComparator();
protected String name;
protected ItemDarkSteelShears(String name) {
@@ -82,6 +85,7 @@ public class ItemDarkSteelShears extends ItemShears
protected ItemDarkSteelShears() {
this("darkSteel");
handler = new EventHandler();
}
@Override
@@ -222,7 +226,6 @@ public class ItemDarkSteelShears extends ItemShears
protected void init() {
GameRegistry.registerItem(this, getUnlocalizedName());
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
@Override
@@ -323,7 +326,7 @@ public class ItemDarkSteelShears extends ItemShears
}
}
public static class EventHandler {
public class EventHandler {
@SubscribeEvent
public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {
@@ -72,12 +72,14 @@ public class ItemDarkSteelSword extends ItemSword
public static ItemDarkSteelSword create() {
ItemDarkSteelSword res = new ItemDarkSteelSword();
res.init();
MinecraftForge.EVENT_BUS.register(res.handler);
return res;
}
protected final int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses();
protected long lastBlickTick = -1;
protected String name;
public EventHandler handler;
public ItemDarkSteelSword(String name, ToolMaterial mat) {
super(mat);
@@ -87,10 +89,12 @@ public class ItemDarkSteelSword extends ItemSword
String str = name + "_sword";
setUnlocalizedName(str);
setTextureName(EnderIO.DOMAIN + ":" + str);
handler = new EventHandler();
}
public ItemDarkSteelSword() {
this("darkSteel", MATERIAL);
handler = new EventHandler();
}
@Override
@@ -226,7 +230,6 @@ public class ItemDarkSteelSword extends ItemSword
protected void init() {
GameRegistry.registerItem(this, getUnlocalizedName());
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
@Override
@@ -89,9 +89,7 @@ public class ContainerCapBank extends ContainerEnderTileEntity<TileCapBank> {
}
if (hasBaublesSlots()) {
// for (int i = 0; i < baubles.getSizeInventory(); i++) {
// Capped since the sprite only has 4 slots
for (int i = 0; i < Math.min(baubles.getSizeInventory(), 4); i++) {
for (int i = 0; i < baubles.getSizeInventory(); i++) {
addSlotToContainer(new Slot(baubles, i, -15 + armorOffset, 84 + i * 18) {
@Override
@@ -124,9 +122,7 @@ public class ContainerCapBank extends ContainerEnderTileEntity<TileCapBank> {
int startHotBarSlot = endPlayerSlot + 1;
int endHotBarSlot = startHotBarSlot + 9;
int startBaublesSlot = endHotBarSlot + 1;
// int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + baubles.getSizeInventory();
// Capped since the sprite only has 4 slots
int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + Math.min(baubles.getSizeInventory(), 4);
int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + baubles.getSizeInventory();
ItemStack copystack = null;
Slot slot = (Slot) inventorySlots.get(slotIndex);
@@ -22,13 +22,16 @@ import crazypants.enderio.xp.PacketGivePlayerXP;
public class BlockKillerJoe extends AbstractMachineBlock<TileKillerJoe> {
static final String USERNAME = "KillerJoe";
public EventHandler handler;
public static BlockKillerJoe create() {
PacketHandler.INSTANCE
.registerMessage(PacketSwing.class, PacketSwing.class, PacketHandler.nextID(), Side.CLIENT);
PacketGivePlayerXP.register();
PacketExperianceContainer.register();
BlockKillerJoe res = new BlockKillerJoe();
MinecraftForge.EVENT_BUS.register(res.handler);
res.init();
return res;
}
@@ -36,12 +39,7 @@ public class BlockKillerJoe extends AbstractMachineBlock<TileKillerJoe> {
protected BlockKillerJoe() {
super(ModObject.blockKillerJoe, TileKillerJoe.class);
setStepSound(Block.soundTypeGlass);
}
@Override
protected void init() {
super.init();
MinecraftForge.EVENT_BUS.register(new EventHandler());
handler = new EventHandler();
}
@Override
@@ -21,21 +21,18 @@ import crazypants.enderio.machine.obelisk.BlockObeliskAbstract;
public class BlockInhibitorObelisk extends BlockObeliskAbstract<TileInhibitorObelisk> {
public static BlockInhibitorObelisk instance;
public EventHandler handler;
public static BlockInhibitorObelisk create() {
BlockInhibitorObelisk res = new BlockInhibitorObelisk();
res.init();
MinecraftForge.EVENT_BUS.register(res.handler);
return instance = res;
}
protected BlockInhibitorObelisk() {
super(ModObject.blockInhibitorObelisk, TileInhibitorObelisk.class);
}
@Override
protected void init() {
super.init();
MinecraftForge.EVENT_BUS.register(new EventHandler());
handler = new EventHandler();
}
@Override
@@ -199,7 +199,7 @@ public class BlockPaintedGlowstone extends BlockEio
@SideOnly(Side.CLIENT)
@Override
public void registerBlockIcons(IIconRegister IIconRegister) {
blockIcon = IIconRegister.registerIcon("glowstone");
blockIcon = IIconRegister.registerIcon("enderio:conduitConnector");
}
@Override
@@ -231,12 +231,10 @@ public class BlockPaintedGlowstone extends BlockEio
@Override
protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) {
if (te instanceof TileEntityPaintedBlock tef) {
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
if (tef != null) {
ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata());
NBTTagCompound tag = itemStack.stackTagCompound;
if (tag != null) {
drop.stackTagCompound = (NBTTagCompound) tag.copy();
}
drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy();
}
}
@@ -63,8 +63,7 @@ public final class PainterUtil {
sourceName = is.getDisplayName();
}
}
return EnderIO.lang.localize("blockPainter.paintedWith") + " "
+ (sourceName.isEmpty() ? EnderIO.lang.localize("blockPainter.paintedWith.none") : sourceName);
return EnderIO.lang.localize("blockPainter.paintedWith") + " " + sourceName;
}
public static void setSourceBlock(ItemStack item, Block source, int meta) {
@@ -89,6 +89,8 @@ public class BlockPoweredSpawner extends AbstractMachineBlock<TilePoweredSpawner
PoweredSpawnerConfig.getInstance();
BlockPoweredSpawner res = new BlockPoweredSpawner();
MinecraftForge.EVENT_BUS.register(res.handler);
FMLCommonHandler.instance().bus().register(res.handler);
res.init();
return res;
}
@@ -97,6 +99,8 @@ public class BlockPoweredSpawner extends AbstractMachineBlock<TilePoweredSpawner
private Field fieldpersistenceRequired;
public EventHandler handler;
protected BlockPoweredSpawner() {
super(ModObject.blockPoweredSpawner, TilePoweredSpawner.class);
@@ -111,14 +115,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock<TilePoweredSpawner
} catch (Exception e) {
Log.error("BlockPoweredSpawner: Could not find field: persistenceRequired");
}
}
@Override
protected void init() {
super.init();
EventHandler handler = new EventHandler();
MinecraftForge.EVENT_BUS.register(handler);
FMLCommonHandler.instance().bus().register(handler);
handler = new EventHandler();
}
private final Map<BlockCoord, ItemStack> dropCache = new HashMap<BlockCoord, ItemStack>();
@@ -777,7 +777,6 @@ enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s%s
#Painter
tile.blockPainter.name=Painting Machine
enderio.blockPainter.paintedWith=Painted with:
enderio.blockPainter.paintedWith.none=§onothing§r
tile.blockPaintedFence.name=Painted Fence
tile.blockPaintedFenceGate.name=Painted Gate
tile.blockPaintedWall.name=Painted Wall
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB