MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ported to 1.16.4.

Browse source
This commit is contained in:
stfwi 2020-11-06 22:54:42 +01:00
parent c6d21db5f9
commit 1a3fcb4376
20 changed files with 37 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/wile/engineersdecor/ModContent.java
View file

@ -864,14 +864,14 @@ public class ModContent
)).setRegistryName(new ResourceLocation(MODID, "steel_mesh_fence_gate"));
public static final EdRailingBlock STEEL_RAILING = (EdRailingBlock)(new EdRailingBlock(
DecorBlock.CFG_CUTOUT,
DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL,
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(1f, 20f).sound(SoundType.METAL).notSolid(),
Auxiliaries.getPixeledAABB(0,0,0, 0, 0,0),
Auxiliaries.getPixeledAABB(0,0,0, 16,15.9,1)
)).setRegistryName(new ResourceLocation(MODID, "steel_railing"));
public static final EdCatwalkBlock STEEL_CATWALK = (EdCatwalkBlock)(new EdCatwalkBlock(
DecorBlock.CFG_CUTOUT,
DecorBlock.CFG_CUTOUT|DecorBlock.CFG_EXPERIMENTAL,
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 20f).sound(SoundType.METAL).notSolid(),
Auxiliaries.getPixeledAABB(0,0,0, 16, 2,16),
Auxiliaries.getPixeledAABB(0,0,0, 16,15.9, 1),

7
src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java
View file

@ -1092,7 +1092,7 @@ public class EdCraftingTable
String[] translation_keys = { "next", "prev", "clear", "nextcollisionrecipe", "fromstorage", "tostorage", "fromplayer", "toplayer" };
for(int i=0; (i<buttons.size()) && (i<translation_keys.length); ++i) {
Button bt = buttons.get(i);
tooltips.add(new TipRange(bt.x,bt.y, bt.getWidth(), bt.getWidth_CLASH/*getHeight*/(), Auxiliaries.localizable(prefix+translation_keys[i])));
tooltips.add(new TipRange(bt.x,bt.y, bt.getWidth(), bt.getHeightRealms(), Auxiliaries.localizable(prefix+translation_keys[i])));
}
tooltip.init(tooltips);
}
@ -1108,11 +1108,10 @@ public class EdCraftingTable
}
renderBackground(mx);
super.render(mx, mouseX, mouseY, partialTicks);
if(!tooltip.render(mx,this, mouseX, mouseY)) func_230459_a_/*renderHoveredToolTip*/(mx, mouseX, mouseY);
if(!tooltip.render(mx,this, mouseX, mouseY)) renderHoveredToolTip(mx, mouseX, mouseY);
}
@Override
protected void func_230459_a_/*renderHoveredToolTip*/(MatrixStack mx, int mouseX, int mouseY)
protected void renderHoveredToolTip(MatrixStack mx, int mouseX, int mouseY)
{
if((!player.inventory.getItemStack().isEmpty()) || (getSlotUnderMouse() == null)) return;
final Slot slot = getSlotUnderMouse();

2
src/main/java/wile/engineersdecor/blocks/EdDropper.java
View file

@ -918,7 +918,7 @@ public class EdDropper
{
renderBackground/*renderBackground*/(mx);
super.render(mx, mouseX, mouseY, partialTicks);
if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
if(!tooltip_.render(mx, this, mouseX, mouseY)) renderHoveredTooltip(mx, mouseX, mouseY);
}
@Override

2
src/main/java/wile/engineersdecor/blocks/EdElectricalFurnace.java
View file

@ -810,7 +810,7 @@ public class EdElectricalFurnace
{
renderBackground/*renderBackground*/(mx);
super.render(mx, mouseX, mouseY, partialTicks);
if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
if(!tooltip_.render(mx, this, mouseX, mouseY)) renderHoveredTooltip(mx, mouseX, mouseY);
}
@Override

2
src/main/java/wile/engineersdecor/blocks/EdFurnace.java
View file

@ -996,7 +996,7 @@ public class EdFurnace
{
renderBackground/*renderBackground*/(mx);
super.render(mx, mouseX, mouseY, partialTicks);
func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
renderHoveredTooltip(mx, mouseX, mouseY);
}
@Override

2
src/main/java/wile/engineersdecor/blocks/EdHopper.java
View file

@ -869,7 +869,7 @@ public class EdHopper
{
renderBackground(mx);
super.render(mx, mouseX, mouseY, partialTicks);
if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
if(!tooltip_.render(mx, this, mouseX, mouseY)) renderHoveredTooltip(mx, mouseX, mouseY);
}
@Override

2
src/main/java/wile/engineersdecor/blocks/EdLabeledCrate.java
View file

@ -721,7 +721,7 @@ public class EdLabeledCrate
{
renderBackground/*renderBackground*/(mx);
super.render(mx, mouseX, mouseY, partialTicks);
func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
renderHoveredTooltip(mx, mouseX, mouseY);
}
@Override

2
src/main/java/wile/engineersdecor/blocks/EdPlacer.java
View file

@ -766,7 +766,7 @@ public class EdPlacer
{
renderBackground/*renderBackground*/(mx);
super.render(mx, mouseX, mouseY, partialTicks);
if(!tooltip_.render(mx, this, mouseX, mouseY)) func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
if(!tooltip_.render(mx, this, mouseX, mouseY)) renderHoveredTooltip(mx, mouseX, mouseY);
}
@Override

2
src/main/java/wile/engineersdecor/blocks/EdWasteIncinerator.java
View file

@ -704,7 +704,7 @@ public class EdWasteIncinerator
{
renderBackground/*renderBackground*/(mx);
super.render(mx, mouseX, mouseY, partialTicks);
func_230459_a_/*func_230459_a_*/(mx, mouseX, mouseY);
renderHoveredTooltip(mx, mouseX, mouseY);
}
@Override

5
src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java
View file

@ -7,8 +7,8 @@
* JEI plugin (see https://github.com/mezz/JustEnoughItems/wiki/Creating-Plugins)
*/
package wile.engineersdecor.eapi.jei;
//public class JEIPlugin {}
public class JEIPlugin {}
/*
import wile.engineersdecor.ModEngineersDecor;
import wile.engineersdecor.ModConfig;
import wile.engineersdecor.ModContent;
@ -74,3 +74,4 @@ public class JEIPlugin implements mezz.jei.api.IModPlugin
}
}
}
*/

2
src/main/java/wile/engineersdecor/libmc/detail/Auxiliaries.java
View file

@ -233,7 +233,7 @@ public class Auxiliaries
}
public static @Nullable ITextComponent unserializeTextComponent(String serialized)
{ return ITextComponent.Serializer.func_240643_a_(serialized); }
{ return ITextComponent.Serializer.getComponentFromJson(serialized); }
public static String serializeTextComponent(ITextComponent tc)
{ return (tc==null) ? ("") : (ITextComponent.Serializer.toJson(tc)); }

3
src/main/java/wile/engineersdecor/libmc/detail/OptionalRecipeCondition.java
View file

@ -11,7 +11,6 @@ package wile.engineersdecor.libmc.detail;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.tags.ITag;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagCollectionManager;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.JSONUtils;
@ -98,7 +97,7 @@ public class OptionalRecipeCondition implements ICondition
if(without_recipes) return false;
if((experimental) && (!with_experimental)) return false;
final IForgeRegistry<Item> item_registry = ForgeRegistries.ITEMS;
final Map<ResourceLocation, ITag<Item>> item_tags = TagCollectionManager.func_242178_a().func_241836_b().func_241833_a(); // ItemTags.getCollection().getTagMap() not set yet
final Map<ResourceLocation, ITag<Item>> item_tags = TagCollectionManager.getManager().getItemTags().getIDTagMap();
if(result != null) {
boolean item_registered = item_registry.containsKey(result);
if(!item_registered) return false; // required result not registered