From 67664593b7a9edea7e6a1c5d84be2e35c029ca73 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 14 Aug 2020 14:26:44 +0100 Subject: [PATCH] Release of 1.15 --- build.gradle | 6 ++--- gradle.properties | 2 +- src/generated/resources/.cache/cache | 2 +- .../models/block/charging_station.json | 13 ++++------ .../common/data/GeneratorBlockStates.java | 24 +++++++------------ .../common/tiles/ChargingStationTile.java | 4 ++-- 6 files changed, 20 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index ecce76e..765b4ad 100644 --- a/build.gradle +++ b/build.gradle @@ -115,9 +115,9 @@ dependencies { compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api") runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}") - runtimeOnly fg.deobf("ignored:buildinggadgets:3.3.2") - runtimeOnly fg.deobf("ignored:mininggadgets:1.3.0") - runtimeOnly fg.deobf("ignored:Mekanism-1.15.2:9.9.17.409") +// runtimeOnly fg.deobf("ignored:buildinggadgets:3.3.2") +// runtimeOnly fg.deobf("ignored:mininggadgets:1.3.0") +// runtimeOnly fg.deobf("ignored:Mekanism-1.15.2:9.9.17.409") // You may put jars on which you depend on in ./libs or you may define them like so.. // compile "some.group:artifact:version:classifier" // compile "some.group:artifact:version" diff --git a/gradle.properties b/gradle.properties index 778b456..1fa3dcc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ org.gradle.daemon=false mod_version=1.0.0 #Dependencies -forge_version=1.15.2-31.1.18 +forge_version=1.15.2-31.2.36 mcp_version=20200307-1.15.1 jei_version=1.15.2:6.0.0.2 \ No newline at end of file diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 959c071..f511684 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,6 +1,6 @@ d2e7c53ffc657e48f859787665bb90d4d004ec3a assets/charginggadgets/blockstates/charging_station.json be821e8cfeb2e993c6da9223608c8a927ddc4c92 assets/charginggadgets/lang/en_us.json -9169e4bc2546eac71686e4c68bc89022e01fbe65 assets/charginggadgets/models/block/charging_station.json +8eb3eb14e57139a85b150d3979a274266827d9fc assets/charginggadgets/models/block/charging_station.json e65f75009ebf20fe399dc4954ad0031af330dc09 assets/charginggadgets/models/item/charging_station.json 4eea0d6b4d86e05e13208029d6afc4bb7497b032 data/charginggadgets/advancements/recipes/charginggadgets/charging_station.json 91ee73c3707ca365d432a98811c1f235e0d3e335 data/charginggadgets/loot_tables/blocks/charging_station.json diff --git a/src/generated/resources/assets/charginggadgets/models/block/charging_station.json b/src/generated/resources/assets/charginggadgets/models/block/charging_station.json index 0ee8dc5..ee7e50e 100644 --- a/src/generated/resources/assets/charginggadgets/models/block/charging_station.json +++ b/src/generated/resources/assets/charginggadgets/models/block/charging_station.json @@ -1,12 +1,9 @@ { - "parent": "block/cube", + "parent": "block/orientable_with_bottom", "textures": { - "down": "charginggadgets:blocks/charging_station_bottom", - "up": "charginggadgets:blocks/charging_station_top", - "north": "charginggadgets:blocks/charging_station_fronton", - "south": "charginggadgets:blocks/charging_station_side", - "east": "charginggadgets:blocks/charging_station_side", - "west": "charginggadgets:blocks/charging_station_side", - "particle": "charginggadgets:blocks/charging_station_side" + "side": "charginggadgets:blocks/charging_station_side", + "front": "charginggadgets:blocks/charging_station_fronton", + "bottom": "charginggadgets:blocks/charging_station_bottom", + "top": "charginggadgets:blocks/charging_station_top" } } \ No newline at end of file diff --git a/src/main/java/com/direwolf20/charginggadgets/common/data/GeneratorBlockStates.java b/src/main/java/com/direwolf20/charginggadgets/common/data/GeneratorBlockStates.java index e1e3a33..9813a56 100644 --- a/src/main/java/com/direwolf20/charginggadgets/common/data/GeneratorBlockStates.java +++ b/src/main/java/com/direwolf20/charginggadgets/common/data/GeneratorBlockStates.java @@ -8,6 +8,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.*; +import java.util.Objects; + final class GeneratorBlockStates extends BlockStateProvider { public GeneratorBlockStates(DataGenerator gen, ExistingFileHelper exFileHelper) { super(gen, ChargingGadgets.MOD_ID, exFileHelper); @@ -17,22 +19,12 @@ public GeneratorBlockStates(DataGenerator gen, ExistingFileHelper exFileHelper) protected void registerStatesAndModels() { assert ModBlocks.CHARGING_STATION.get().getRegistryName() != null; - ResourceLocation side = modLoc("blocks/charging_station_side"); - - BlockModelBuilder cube = models().cube( - ModBlocks.CHARGING_STATION.get().getRegistryName().getPath(), - modLoc("blocks/charging_station_bottom"), - modLoc("blocks/charging_station_top"), + horizontalBlock(ModBlocks.CHARGING_STATION.get(), models().orientableWithBottom( + Objects.requireNonNull(ModBlocks.CHARGING_STATION.get().getRegistryName()).getPath(), + modLoc("blocks/charging_station_side"), modLoc("blocks/charging_station_fronton"), - side, side, side - ).texture("particle", side); - - getVariantBuilder(ModBlocks.CHARGING_STATION.get()) - .forAllStates(state -> { - Direction dir = state.get(ChargingStationBlock.FACING); - return ConfiguredModel.builder().modelFile(cube).rotationY( - dir.getAxis().isVertical() ? 0 : (((int) dir.getHorizontalAngle()) + 180) % 360 - ).build(); - }); + modLoc("blocks/charging_station_bottom"), + modLoc("blocks/charging_station_top") + )); } } diff --git a/src/main/java/com/direwolf20/charginggadgets/common/tiles/ChargingStationTile.java b/src/main/java/com/direwolf20/charginggadgets/common/tiles/ChargingStationTile.java index 9398f63..a85797b 100644 --- a/src/main/java/com/direwolf20/charginggadgets/common/tiles/ChargingStationTile.java +++ b/src/main/java/com/direwolf20/charginggadgets/common/tiles/ChargingStationTile.java @@ -133,7 +133,7 @@ private void tryBurn() { return; this.getCapability(CapabilityEnergy.ENERGY).ifPresent(energyStorage -> { - boolean canInsertEnergy = energyStorage.receiveEnergy(2500, true) > 0; + boolean canInsertEnergy = energyStorage.receiveEnergy(625, true) > 0; if (counter > 0 && canInsertEnergy) { burn(energyStorage); } else if (canInsertEnergy) { @@ -145,7 +145,7 @@ private void tryBurn() { private void burn(IEnergyStorage energyStorage) { - energyStorage.receiveEnergy(2500, false); + energyStorage.receiveEnergy(625, false); counter--; if (counter == 0) {