diff --git a/build.gradle b/build.gradle index f2da4694..477a323d 100644 --- a/build.gradle +++ b/build.gradle @@ -130,8 +130,6 @@ dependencies { modRuntimeOnly "objects:client:43db9b498cb67058d2e12d394e6507722e71bb45" // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar modImplementation "fabric-loader:fabric-loader:${project.loader_version}" - include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:0.2.0-beta.9"))) - // Helper library // If you do not need Halplibe you can comment this line out or delete this line modImplementation "bta-halplibe:halplibe:${project.halplibe_version}" diff --git a/gradle.properties b/gradle.properties index 7dd555ee..7381c646 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx2G bta_version=7.1-pre1a # Loader -loader_version=0.14.19-babric.3-bta +loader_version=0.15.6-babric.4-bta # Mods -halplibe_version=3.3.7 +halplibe_version=3.4.1 modmenu_version=2.0.3 dragonfly_version=1.4.4-7.1 btwaila_version=1.0.7-7.1 diff --git a/src/main/java/sunsetsatellite/signalindustries/SignalIndustries.java b/src/main/java/sunsetsatellite/signalindustries/SignalIndustries.java index a8956698..9fd144f5 100644 --- a/src/main/java/sunsetsatellite/signalindustries/SignalIndustries.java +++ b/src/main/java/sunsetsatellite/signalindustries/SignalIndustries.java @@ -802,7 +802,8 @@ public class SignalIndustries implements ModInitializer, GameStartEntrypoint { public static final Item pulsar = ItemHelper.createItem(MOD_ID,new ItemPulsar("reinforced.pulsar",config.getInt("ItemIDs.pulsar"), Tier.REINFORCED),"pulsaractive.png").setMaxStackSize(1); public static final int[][] pulsarTex = new int[][]{TextureHelper.getOrCreateItemTexture(MOD_ID,"pulsarinactive.png"),TextureHelper.getOrCreateItemTexture(MOD_ID,"pulsaractive.png"),TextureHelper.getOrCreateItemTexture(MOD_ID,"pulsarcharged.png"),TextureHelper.getOrCreateItemTexture(MOD_ID,"pulsarwarpactive.png"),TextureHelper.getOrCreateItemTexture(MOD_ID,"pulsarwarpcharged.png")}; - public static final Item sunriseDawn = ItemHelper.createItem(MOD_ID,new ItemSunriseDawn("awakened.sunriseDawn",config.getInt("ItemIDs.sunriseDawn"), ToolMaterial.steel, Tier.AWAKENED),"sunrise_dawn.png").setMaxStackSize(1); + //TODO: WIP + //public static final Item sunriseDawn = ItemHelper.createItem(MOD_ID,new ItemSunriseDawn("awakened.sunriseDawn",config.getInt("ItemIDs.sunriseDawn"), ToolMaterial.steel, Tier.AWAKENED),"sunrise_dawn.png").setMaxStackSize(1); public static final ItemSignalumPowerSuit signalumPowerSuitHelmet = (ItemSignalumPowerSuit) ItemHelper.createItem(MOD_ID,new ItemSignalumPowerSuit("reinforced.signalumpowersuit.helmet",config.getInt("ItemIDs.signalumPowerSuitHelmet"),armorSignalumPowerSuit,0,Tier.REINFORCED),"signalumpowersuit_helmet.png"); public static final ItemSignalumPowerSuit signalumPowerSuitChestplate = (ItemSignalumPowerSuit) ItemHelper.createItem(MOD_ID,new ItemSignalumPowerSuit("reinforced.signalumpowersuit.chestplate",config.getInt("ItemIDs.signalumPowerSuitChestplate"),armorSignalumPowerSuit,1,Tier.REINFORCED),"signalumpowersuit_chestplate.png"); @@ -979,8 +980,8 @@ public SignalIndustries(){ ironPlateHammer.setContainerItem(ironPlateHammer); - CommandHelper.createCommand(new NBTEditCommand()); - CommandHelper.createCommand(new StructureCommand("structure","struct")); + CommandHelper.Core.createCommand(new NBTEditCommand()); + CommandHelper.Core.createCommand(new StructureCommand("structure","struct")); EntityHelper.Core.createSpecialTileEntity(TileEntityConduit.class, new RenderFluidInConduit(),"Conduit"); EntityHelper.Core.createSpecialTileEntity(TileEntityFluidConduit.class, new RenderFluidInConduit(),"Fluid Conduit"); EntityHelper.Core.createEntity(EntityCrystal.class,47,"signalumCrystal"); diff --git a/src/main/java/sunsetsatellite/signalindustries/inventories/machines/TileEntityReinforcedWrathBeacon.java b/src/main/java/sunsetsatellite/signalindustries/inventories/machines/TileEntityReinforcedWrathBeacon.java index cdefdf32..9768d76b 100644 --- a/src/main/java/sunsetsatellite/signalindustries/inventories/machines/TileEntityReinforcedWrathBeacon.java +++ b/src/main/java/sunsetsatellite/signalindustries/inventories/machines/TileEntityReinforcedWrathBeacon.java @@ -114,7 +114,7 @@ public void tick() { EntityItem entityitem2 = new EntityItem(worldObj, (float) x, (float) y, (float) z, new ItemStack(SignalIndustries.reinforcedWrathBeacon, 1)); worldObj.entityJoinedWorld(entityitem2); } - if(active && started && enemiesLeft.isEmpty() && wave < waves.size()){ + if(active && started && enemiesLeft.isEmpty() && enemiesSpawned == currentMaxAmount && wave < waves.size()-1){ for (EntityPlayer player : worldObj.players) { Minecraft.getMinecraft(Minecraft.class).ingameGUI.addChatMessage("Wave "+wave+" complete! Next wave in: "+(intermissionTimer.max/20)+"s."); } @@ -123,7 +123,7 @@ public void tick() { intermission = true; enemiesSpawned = 0; wave++; - } else if (active && started && enemiesLeft.isEmpty()) { + } else if (active && started && enemiesLeft.isEmpty() && enemiesSpawned == currentMaxAmount && wave == waves.size()-1) { for (EntityPlayer player : worldObj.players) { Minecraft.getMinecraft(Minecraft.class).ingameGUI.addChatMessage("Challenge complete!!"); } @@ -243,6 +243,9 @@ public void suddenDeathSpawn(){ mob.setRot(worldObj.rand.nextFloat() * 360.0F, 0.0F); mob.spawnInit(); worldObj.entityJoinedWorld(mob); + if(mob instanceof EntityInfernal){ + ((EntityInfernal) mob).eclipseImmune = true; + } } else { suddenDeathSpawnTImer.pause(); } @@ -255,7 +258,7 @@ public void startWave(){ if(active){ for (EntityPlayer player : worldObj.players) { Minecraft.getMinecraft(Minecraft.class).ingameGUI.addChatMessage("WAVE "+wave); - if(wave == waves.size()){ + if(wave == waves.size()-1){ Minecraft.getMinecraft(Minecraft.class).ingameGUI.addChatMessage("FINAL WAVE!"); } } diff --git a/src/main/java/sunsetsatellite/signalindustries/items/ItemSunriseDawn.java b/src/main/java/sunsetsatellite/signalindustries/items/ItemSunriseDawn.java index f7a131c3..10ceb044 100644 --- a/src/main/java/sunsetsatellite/signalindustries/items/ItemSunriseDawn.java +++ b/src/main/java/sunsetsatellite/signalindustries/items/ItemSunriseDawn.java @@ -33,13 +33,13 @@ public Tier getTier() { @Override public int getDamageVsEntity(Entity entity, ItemStack stack) { - for (Entity entity1 : new ArrayList<>(Minecraft.getMinecraft(this).theWorld.loadedEntityList)) { + /*for (Entity entity1 : new ArrayList<>(Minecraft.getMinecraft(this).theWorld.loadedEntityList)) { if (entity1 instanceof EntityLiving) { - if (entity1.distanceTo(Minecraft.getMinecraft(this).thePlayer) < 10) { + if (entity1.distanceTo(Minecraft.getMinecraft(this).thePlayer) < 10 && entity1 != Minecraft.getMinecraft(this).thePlayer) { entity1.hurt(entity1, 999, DamageType.GENERIC); } } - } - return 999; + }*/ + return 0; } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 91bacfac..9c350fcd 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -47,13 +47,13 @@ "signalindustries.mixins.json" ], "depends": { - "fabricloader": ">=0.14.19-babric.3-bta", + "fabricloader": ">=0.15.6-babric.4-bta", "minecraft": ">=7.1-beta.1a", "catalyst-core": ">=1.1.2", "catalyst-fluids": ">=1.0.1", "catalyst-multiblocks": ">=1.0.1", "catalyst-energy": ">=1.0.2", - "halplibe": ">=3.3.3", + "halplibe": ">=3.4.1", "dragonfly": ">=1.4.3-7.1", "terrain-api": ">=1.4.2-7.1" }