From ff6ee029fd2f8cf99b2d2f74dd851bb37baa5690 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 26 Apr 2020 19:48:09 +0100 Subject: [PATCH 1/7] #releaseBuild --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b1e3cbe89..6eecaa100 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ repositories { } } -version = "3.3.8" +version = "3.3.10" configurations { shade From 628b7424fa3600471617cf4f873c38a438b42d6a Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 3 May 2020 00:15:08 +0100 Subject: [PATCH 2/7] #releaseBuild --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6eecaa100..133b7edee 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ repositories { } } -version = "3.3.10" +version = "3.3.11" configurations { shade From 273401473c673a0092a8250c11e7e31c6200d085 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 4 May 2020 13:38:38 +0300 Subject: [PATCH 3/7] Fix quantum tank advancement. Closes #2096 --- src/main/resources/data/techreborn/advancements/tank.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/data/techreborn/advancements/tank.json b/src/main/resources/data/techreborn/advancements/tank.json index a6649e69f..15358a961 100644 --- a/src/main/resources/data/techreborn/advancements/tank.json +++ b/src/main/resources/data/techreborn/advancements/tank.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "techreborn:quantum_tank" + "item": "techreborn:quantum_tank_unit" }, "title": { "translate": "advancements.techreborn.quantumtank" @@ -16,7 +16,7 @@ "crit1": { "trigger": "minecraft:placed_block", "conditions": { - "block": "techreborn:quantum_tank" + "block": "techreborn:quantum_tank_unit" } } } From 2e67d562251f15fb22f929c9aab28415f0b3ebc5 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 6 May 2020 14:43:19 +0300 Subject: [PATCH 4/7] Saplings are back in Overworld chests. Some work on #2100 --- src/main/java/techreborn/init/ModLoot.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/init/ModLoot.java b/src/main/java/techreborn/init/ModLoot.java index f10cb78cd..4a96fbfbb 100644 --- a/src/main/java/techreborn/init/ModLoot.java +++ b/src/main/java/techreborn/init/ModLoot.java @@ -48,6 +48,7 @@ public class ModLoot { LootEntry advancedalloyIngot = makeEntry(Ingots.ADVANCED_ALLOY); LootEntry basicFrame = makeEntry(TRContent.MachineBlocks.BASIC.frame.asItem()); LootEntry basicCircuit = makeEntry(Parts.ELECTRONIC_CIRCUIT); + LootEntry rubberSapling = makeEntry(TRContent.RUBBER_SAPLING, 25); LootEntry aluminumIngot = makeEntry(Ingots.ALUMINUM); LootEntry electrumIngot = makeEntry(Ingots.ELECTRUM); @@ -73,7 +74,7 @@ public class ModLoot { LootPool poolBasic = FabricLootPoolBuilder.builder().withEntry(copperIngot).withEntry(tinIngot) .withEntry(leadIngot).withEntry(silverIngot).withEntry(refinedronIngot).withEntry(advancedalloyIngot) - .withEntry(basicFrame).withEntry(basicCircuit).withRolls(UniformLootTableRange.between(1.0f, 2.0f)) + .withEntry(basicFrame).withEntry(basicCircuit).withEntry(rubberSapling).withRolls(UniformLootTableRange.between(1.0f, 2.0f)) .build(); LootPool poolAdvanced = FabricLootPoolBuilder.builder().withEntry(aluminumIngot).withEntry(electrumIngot) @@ -137,8 +138,18 @@ public class ModLoot { * @return LootEntry for item provided */ private static LootEntry makeEntry(ItemConvertible item) { + return makeEntry(item, 5); + } - return ItemEntry.builder(item).setWeight(5) + /** + * Makes loot entry from item provided with weight provided + * + * @param item Item to include into LootEntry + * @param weight Weight of that item + * @return LootEntry for item and weight provided + */ + private static LootEntry makeEntry(ItemConvertible item, int weight){ + return ItemEntry.builder(item).setWeight(weight) .withFunction(SetCountLootFunction.builder(UniformLootTableRange.between(1.0f, 2.0f))).build(); } From fdc6f88dbc3982bb71653b98af5f8d28a9047a49 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 6 May 2020 15:08:46 +0300 Subject: [PATCH 5/7] Solar panels will work in Nether and The End. Closes #2105 --- .../generator/SolarPanelBlockEntity.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java b/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java index 3ebdc3418..30143f0d2 100644 --- a/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java @@ -63,10 +63,6 @@ public class SolarPanelBlockEntity extends PowerAcceptorBlockEntity implements I private SolarPanels panel; - public SolarPanelBlockEntity() { - super(TRBlockEntities.SOLAR_PANEL); - } - public SolarPanelBlockEntity(SolarPanels panel) { super(TRBlockEntities.SOLAR_PANEL); this.panel = panel; @@ -101,6 +97,9 @@ public class SolarPanelBlockEntity extends PowerAcceptorBlockEntity implements I } private void updateState() { + if (world == null) { + return; + } if (world.isSkyVisible(pos.up())) { this.setSunState(NIGHTGEN); @@ -110,6 +109,10 @@ public class SolarPanelBlockEntity extends PowerAcceptorBlockEntity implements I } else { this.setSunState(ZEROGEN); } + // Nether and The End + if (!world.dimension.hasSkyLight()) { + this.setSunState(NIGHTGEN); + } if (prevState != this.getSunState()) { boolean isGenerating = getSunState() == DAYGEN; @@ -141,6 +144,10 @@ public class SolarPanelBlockEntity extends PowerAcceptorBlockEntity implements I public void tick() { super.tick(); + if (world == null){ + return; + } + if (world.isClient) { return; } From ed5478c8b7b75ec7d9cd449fb85b487ec6c96ed3 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 26 May 2020 19:52:58 +0800 Subject: [PATCH 6/7] Show tooltip only for TR items. Kudos to Shedaniel (#2122) --- build.gradle | 2 +- .../techreborn/events/StackToolTipHandler.java | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 133b7edee..180ee8f66 100644 --- a/build.gradle +++ b/build.gradle @@ -74,7 +74,7 @@ group = 'TechReborn' dependencies { minecraft "com.mojang:minecraft:1.15.2" mappings "net.fabricmc:yarn:1.15.2+build.2:v2" - modImplementation "net.fabricmc:fabric-loader:0.7.5+build.178" + modImplementation "net.fabricmc:fabric-loader:0.8.4+build.198" //Fabric api modImplementation "net.fabricmc.fabric-api:fabric-api:0.4.29+build.290-1.15" diff --git a/src/main/java/techreborn/events/StackToolTipHandler.java b/src/main/java/techreborn/events/StackToolTipHandler.java index b6479edbc..a4ffe49ce 100644 --- a/src/main/java/techreborn/events/StackToolTipHandler.java +++ b/src/main/java/techreborn/events/StackToolTipHandler.java @@ -24,6 +24,7 @@ package techreborn.events; +import com.google.common.collect.Maps; import net.fabricmc.fabric.api.event.client.ItemTooltipCallback; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; @@ -53,10 +54,12 @@ import techreborn.utils.WIP; import java.util.ArrayList; import java.util.List; +import java.util.Map; public class StackToolTipHandler implements ItemTooltipCallback { private static ArrayList wipBlocks = new ArrayList<>(); + public static final Map ITEM_ID = Maps.newHashMap(); public static void setup() { ItemTooltipCallback.EVENT.register(new StackToolTipHandler()); @@ -69,8 +72,10 @@ public class StackToolTipHandler implements ItemTooltipCallback { @Override public void getTooltip(ItemStack stack, TooltipContext tooltipContext, List components) { Item item = stack.getItem(); - - + + if (!ITEM_ID.computeIfAbsent(item, this::isTRItem)) + return; + // Machine info and upgrades helper section Block block = Block.getBlockFromItem(item); @@ -130,7 +135,11 @@ public class StackToolTipHandler implements ItemTooltipCallback { } } } - + + private boolean isTRItem(Item item) { + return Registry.ITEM.getId(item).getNamespace().equals("techreborn"); + } + public int percentage(int MaxValue, int CurrentValue) { if (CurrentValue == 0) return 0; From f5cd9926862fd03b1871a592a2a348c5223892b2 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 1 Jun 2020 22:06:56 +0100 Subject: [PATCH 7/7] loom + loader + api updates --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 180ee8f66..eaf7e6d6f 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { } } dependencies { - classpath "net.fabricmc:fabric-loom:0.2.7-SNAPSHOT" + classpath "net.fabricmc:fabric-loom:0.4-SNAPSHOT" classpath "gradle.plugin.net.minecrell:licenser:0.2.1" classpath 'de.undercouch:gradle-download-task:3.4.3' classpath "com.wynprice.cursemaven:CurseMaven:2.1.1" @@ -74,10 +74,10 @@ group = 'TechReborn' dependencies { minecraft "com.mojang:minecraft:1.15.2" mappings "net.fabricmc:yarn:1.15.2+build.2:v2" - modImplementation "net.fabricmc:fabric-loader:0.8.4+build.198" + modImplementation "net.fabricmc:fabric-loader:0.8.5+build.199" //Fabric api - modImplementation "net.fabricmc.fabric-api:fabric-api:0.4.29+build.290-1.15" + modImplementation "net.fabricmc.fabric-api:fabric-api:0.11.1+build.312-1.15" optionalDependency ("me.shedaniel:RoughlyEnoughItems:3.6.0") optionalDependency ('io.github.cottonmc:LibCD:2.0.1+1.15')