upstream/Postea
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Postea.git synced 2026-11-12 08:27:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

some small work

Browse Source
This commit is contained in:
Connor Colenso committed 2023-11-01 23:54:59 +00:00
1 parent 7f7cdacfbd
commit 7bf44e6661
5 files changed
+106 -206
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/colen/postea/API/ItemStackKey.java
-37
View File
@@ -1,37 +0,0 @@
package com.colen.postea.API;
import java.util.Objects;
import net.minecraft.item.Item;
public class ItemStackKey {
private final Item item;
private final int meta;
public ItemStackKey(Item item, int meta) {
this.item = item;
this.meta = meta;
}
@Override
public boolean equals(Object o) {
if (o == null) return false;
if (o instanceof ItemStackKey that) {
return (this.meta == that.meta) && (this.item == that.item);
} else return false;
}
@Override
public int hashCode() {
return Objects.hash(item, meta);
}
public int getDamage() {
return meta;
}
public Item getItem() {
return item;
}
}
src/main/java/com/colen/postea/Postea.java
+34 -109
View File
@@ -1,24 +1,15 @@
package com.colen.postea;
import static com.colen.postea.Utility.PosteaUtilities.cleanseNBT;
import java.util.function.Function;
import com.colen.postea.API.BlockReplacementManager;
import com.colen.postea.Utility.BlockConversionInfo;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import com.colen.postea.API.BlockReplacementManager;
import com.colen.postea.API.ItemStackReplacementManager;
import com.colen.postea.API.TileEntityReplacementManager;
import com.colen.postea.Utility.BlockConversionInfo;
import com.colen.postea.Utility.BlockInfo;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import java.util.function.Function;
@Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, acceptedMinecraftVersions = "[1.7.10]")
@SuppressWarnings("unused")
@@ -27,111 +18,45 @@ public class Postea {
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
// This is an example of replacing GT ore blocks depending on the dimension. Because BlockInfo has no TileEntity
// transformer set, it will delete the underlying tile entity fully. This will essentially convert a TE block to
// a non-TE block.
// You can use the data in the tile to determine this conversion from the "tag" variable.
TileEntityReplacementManager.tileEntityTransformer("GT_TileEntity_Ores", (tag, world) -> {
if (world.provider.dimensionId == -1) {
return new BlockInfo(Blocks.wool, 1);
}
ModContainer activeMod = Loader.instance().activeModContainer();
String modID = activeMod.getModId();
String v = activeMod.getVersion();
if (world.provider.dimensionId == 1) {
return new BlockInfo(Blocks.wool, 2);
}
return new BlockInfo(Blocks.wool, 3);
});
// This is an example of how to replace another tile entity and it's block. Here we are replacing furnaces with
// chests.
// It will then also replace the furnace block with a chest. Otherwise the Tile would not match the block.
TileEntityReplacementManager.tileEntityTransformer("Furnace", (tag, world) -> {
Function<NBTTagCompound, NBTTagCompound> chestTransformer = (oldTag) -> {
NBTTagCompound newTag = cleanseNBT("Chest", oldTag);
NBTTagList tagList = new NBTTagList();
NBTTagCompound stoneAtSlot13 = new NBTTagCompound();
stoneAtSlot13.setByte("Count", (byte) 1);
stoneAtSlot13.setByte("Slot", (byte) 13);
stoneAtSlot13.setShort("Damage", (short) 0);
stoneAtSlot13.setShort("id", (short) 1);
tagList.appendTag(stoneAtSlot13);
newTag.setTag("Items", tagList);
return newTag;
};
return new BlockInfo(Blocks.chest, 0, chestTransformer);
});
// This is an example of how to change the data of a specific tile entity. You provide the Tiles ID e.g. Chest
// and then provide a conversion function. In this instance we are changing the contents of a chest.
// This will replace the contents fully with stone and jungle planks at specific slots.
TileEntityReplacementManager.tileEntityTransformer("Chest", (tag, world) -> {
Function<NBTTagCompound, NBTTagCompound> chestTransformer = (oldTag) -> {
NBTTagCompound newTag = cleanseNBT("Chest", oldTag);
NBTTagList tagList = new NBTTagList();
NBTTagCompound stoneAtSlot12 = new NBTTagCompound();
stoneAtSlot12.setByte("Count", (byte) 2);
stoneAtSlot12.setByte("Slot", (byte) 12);
stoneAtSlot12.setShort("Damage", (short) 0);
stoneAtSlot12.setShort("id", (short) Block.getIdFromBlock(Blocks.stone));
NBTTagCompound stoneAtSlot14 = new NBTTagCompound();
stoneAtSlot14.setByte("Count", (byte) 4);
stoneAtSlot14.setByte("Slot", (byte) 14);
stoneAtSlot14.setShort("Damage", (short) 3);
stoneAtSlot14.setShort("id", (short) Block.getIdFromBlock(Blocks.planks));
tagList.appendTag(stoneAtSlot12);
tagList.appendTag(stoneAtSlot14);
newTag.setTag("Items", tagList);
return newTag;
};
return new BlockInfo(Blocks.chest, 0, chestTransformer);
});
// Example of how to replace a non-TE block with another non-TE block, this replaces grass with wool.
// It converts every grass block with an even x coordinate to orange wool.
Function<BlockConversionInfo, BlockConversionInfo> blockTransformer = (blockConversionInfoOld) -> {
BlockConversionInfo blockConversionInfoNew = new BlockConversionInfo();
if ((blockConversionInfoOld.x % 2 == 0)) {
if ((blockConversionInfoOld.x == -1) && (blockConversionInfoOld.y == 3) && (blockConversionInfoOld.z == -1)) {
blockConversionInfoNew.blockID = Block.getIdFromBlock(Blocks.wool);
blockConversionInfoNew.metadata = 1;
} else {
blockConversionInfoNew.blockID = blockConversionInfoOld.blockID;
blockConversionInfoNew.metadata = blockConversionInfoOld.metadata;
return blockConversionInfoNew;
}
if ((blockConversionInfoOld.x == -1) && (blockConversionInfoOld.y == 3) && (blockConversionInfoOld.z == 1)) {
blockConversionInfoNew.blockID = Block.getIdFromBlock(Blocks.wool);
blockConversionInfoNew.metadata = 1;
return blockConversionInfoNew;
}
if ((blockConversionInfoOld.x == 1) && (blockConversionInfoOld.y == 3) && (blockConversionInfoOld.z == 1)) {
blockConversionInfoNew.blockID = Block.getIdFromBlock(Blocks.wool);
blockConversionInfoNew.metadata = 1;
return blockConversionInfoNew;
}
if ((blockConversionInfoOld.x == 1) && (blockConversionInfoOld.y == 3) && (blockConversionInfoOld.z == -1)) {
blockConversionInfoNew.blockID = Block.getIdFromBlock(Blocks.wool);
blockConversionInfoNew.metadata = 1;
return blockConversionInfoNew;
}
blockConversionInfoNew.blockID = blockConversionInfoOld.blockID;
blockConversionInfoNew.metadata = blockConversionInfoOld.metadata;
return blockConversionInfoNew;
};
BlockReplacementManager.addBlockReplacement("minecraft:grass", blockTransformer);
// Example of how to replace an item, this replaces iron ingots with gold ingots.
// You can manipulate stack size but it isn't recommended.
// You can also use the tag associated with this ItemStack to determine the replacement.
Function<NBTTagCompound, NBTTagCompound> itemTransformer = (tag) -> {
tag.setShort("id", (short) Item.getIdFromItem(Items.gold_ingot));
return tag;
};
ItemStackReplacementManager.addItemReplacement("minecraft:iron_ingot", itemTransformer);
}
}
src/main/java/com/colen/postea/Utility/ChunkFixerUtility.java
+2 -2
View File
@@ -55,9 +55,9 @@ public class ChunkFixerUtility {
int y = (index / 256) + (sectionY * 16); // Add the offset of the current section in Y direction
int z = (index / 16) % 16;
blockConversionInfo.x = x + chunkXPos;
blockConversionInfo.x = x + chunkXPos + 1;
blockConversionInfo.y = y; // Y remains unchanged as it's already global
blockConversionInfo.z = z + chunkZPos;
blockConversionInfo.z = z + chunkZPos + 1;
BlockConversionInfo output = BlockReplacementManager.getBlockReplacement(blockConversionInfo);
if (output != null) {