Skip to content

Commit

Permalink
Remove code for unneeded cauldron registrations
Browse files Browse the repository at this point in the history
  • Loading branch information
@KnightMiner
KnightMiner committed Oct 29, 2022
1 parent f971dbb commit 9424d81
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 212 deletions.
52 changes: 0 additions & 52 deletions src/main/java/knightminer/inspirations/recipes/InspirationsRecipes.java
View file
Expand Up @@ -9,7 +9,6 @@
import knightminer.inspirations.library.recipe.cauldron.special.DyeableCauldronRecipe;
import knightminer.inspirations.library.recipe.cauldron.special.EmptyPotionCauldronRecipe;
import knightminer.inspirations.library.recipe.cauldron.special.FillPotionCauldronRecipe;
import knightminer.inspirations.recipes.block.EnhancedCauldronBlock;
import knightminer.inspirations.recipes.data.RecipesRecipeProvider;
import knightminer.inspirations.recipes.item.EmptyBottleItem;
import knightminer.inspirations.recipes.item.MixedDyedBottleItem;
Expand All @@ -22,7 +21,6 @@
import knightminer.inspirations.recipes.recipe.cauldron.MixCauldronDyeRecipe;
import knightminer.inspirations.recipes.recipe.cauldron.PotionFermentCauldronTransform;
import knightminer.inspirations.recipes.recipe.cauldron.RemoveBannerPatternCauldronRecipe;
import knightminer.inspirations.recipes.tileentity.CauldronTileEntity;
import net.minecraft.core.particles.ParticleType;
import net.minecraft.core.particles.SimpleParticleType;
import net.minecraft.data.DataGenerator;
Expand All @@ -39,7 +37,6 @@
import net.minecraft.world.item.crafting.SimpleRecipeSerializer;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.LiquidBlock;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.level.material.Material;
Expand All @@ -52,7 +49,6 @@
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import slimeknights.mantle.registration.FluidBuilder;
import slimeknights.mantle.registration.ModelFluidAttributes;
import slimeknights.mantle.registration.adapter.BlockEntityTypeRegistryAdapter;
import slimeknights.mantle.registration.adapter.BlockRegistryAdapter;
import slimeknights.mantle.registration.adapter.FluidRegistryAdapter;
import slimeknights.mantle.registration.adapter.ItemRegistryAdapter;
Expand All @@ -63,12 +59,6 @@
public class InspirationsRecipes extends ModuleBase {

// blocks
public static Block fullAnvil;
public static Block chippedAnvil;
public static Block damagedAnvil;

public static EnhancedCauldronBlock cauldron;
public static BlockEntityType<CauldronTileEntity> tileCauldron;

// items
public static Item splashBottle;
Expand Down Expand Up @@ -136,18 +126,6 @@ void registerBlocks(Register<Block> event) {
rabbitStewBlock = registry.registerFluidBlock(() -> rabbitStew, Material.WATER, 0, "rabbit_stew");
potatoSoupBlock = registry.registerFluidBlock(() -> potatoSoup, Material.WATER, 0, "potato_soup");
honeyFluidBlock = registry.registerFluidBlock(() -> honey, Material.WATER, 0, "honey");

/*
if (Config.enableAnvilSmashing.get()) {
registry.registerOverride(SmashingAnvilBlock::new, Blocks.ANVIL);
registry.registerOverride(SmashingAnvilBlock::new, Blocks.CHIPPED_ANVIL);
registry.registerOverride(SmashingAnvilBlock::new, Blocks.DAMAGED_ANVIL);
}
*/
// TODO: violates rules, probably would just want our own cauldron(s)
// if (Config.extendedCauldron.get()) {
// cauldron = registry.registerOverride(EnhancedCauldronBlock::new, Blocks.CAULDRON);
// }
}

@SubscribeEvent
Expand Down Expand Up @@ -180,20 +158,6 @@ void registerItems(Register<Item> event) {
.craftRemainder(Items.GLASS_BOTTLE);
simpleDyedWaterBottle = registry.registerEnum(color -> new SimpleDyedBottleItem(bottleProps, DyeItem.byColor(color)), DyeColor.values(), "dyed_bottle");
mixedDyedWaterBottle = registry.register(new MixedDyedBottleItem(bottleProps), "mixed_dyed_bottle");

// cauldron item
// if (Config.extendedCauldron.get()) {
// registry.registerBlockItem(cauldron, brewingProps);
// }
}

@SubscribeEvent
void registerTileEntities(Register<BlockEntityType<?>> event) {
BlockEntityTypeRegistryAdapter registry = new BlockEntityTypeRegistryAdapter(event.getRegistry());

// if (Config.extendedCauldron.get()) {
// tileCauldron = registry.register(CauldronTileEntity::new, cauldron, "cauldron");
// }
}

@SubscribeEvent
Expand Down Expand Up @@ -242,22 +206,6 @@ void gatherData(GatherDataEvent event) {

@SubscribeEvent
void commonSetup(FMLCommonSetupEvent event) {
// TODO: cauldrons
// if (Config.extendedCauldron.get()) {
// // inject new cauldron blocks into the leatherworker point of interest
// // it should be as simple as injecting it into the map, but people keep reporting issues with this so just over do it
// Map<BlockState, PoiType> map = GameData.getBlockStatePointOfInterestTypeMap();
// synchronized (map) {
// ImmutableList<BlockState> newStates = cauldron.getStateDefinition().getPossibleStates();
// synchronized (PoiType.LEATHERWORKER) {
// ImmutableSet.Builder<BlockState> builder = ImmutableSet.builder();
// builder.addAll(PoiType.LEATHERWORKER.matchingStates);
// builder.addAll(newStates);
// PoiType.LEATHERWORKER.matchingStates = builder.build();
// }
// newStates.forEach(state -> map.put(state, PoiType.LEATHERWORKER));
// }
// }
}


Expand Down
35 changes: 0 additions & 35 deletions src/main/java/knightminer/inspirations/recipes/RecipesClientEvents.java
View file
Expand Up @@ -6,24 +6,15 @@
import knightminer.inspirations.library.MiscUtil;
import knightminer.inspirations.library.client.CustomTextureLoader;
import knightminer.inspirations.library.client.model.CauldronModel;
import knightminer.inspirations.library.recipe.cauldron.CauldronContentTypes;
import knightminer.inspirations.library.recipe.cauldron.contents.ICauldronContents;
import knightminer.inspirations.recipes.client.BoilingParticle;
import knightminer.inspirations.recipes.item.MixedDyedBottleItem;
import knightminer.inspirations.recipes.tileentity.CauldronTileEntity;
import knightminer.inspirations.shared.SharedClientEvents;
import net.minecraft.client.Minecraft;
import net.minecraft.client.color.block.BlockColors;
import net.minecraft.client.color.item.ItemColors;
import net.minecraft.client.renderer.BiomeColors;
import net.minecraft.client.renderer.ItemBlockRenderTypes;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.server.packs.resources.ReloadableResourceManager;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.world.inventory.InventoryMenu;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.material.Fluids;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.ColorHandlerEvent;
import net.minecraftforge.client.event.ModelRegistryEvent;
Expand Down Expand Up @@ -65,32 +56,6 @@ static void clientSetup(FMLClientSetupEvent event) {
@SubscribeEvent
static void registerModelLoaders(ModelRegistryEvent event) {
ModelLoaderRegistry.registerLoader(Inspirations.getResource("cauldron"), CauldronModel.LOADER);
SharedClientEvents.configPack.addBlockstateReplacement(Config.extendedCauldron, Blocks.CAULDRON, "cauldron");
}

@SubscribeEvent
static void registerBlockColors(ColorHandlerEvent.Block event) {
BlockColors blockColors = event.getBlockColors();

// coloring of liquid inside, for fluids, potions, and dyes
registerBlockColors(blockColors, (state, world, pos, tintIndex) -> {
// skip tint index 0, that is particles
if (tintIndex > 0 && world != null && pos != null) {
// must be cauldron TE
BlockEntity te = world.getBlockEntity(pos);
if(te instanceof CauldronTileEntity) {
// if it contains water, run vanilla tinting
ICauldronContents contents = ((CauldronTileEntity) te).getContents();
if (!contents.matches(CauldronContentTypes.FLUID, Fluids.WATER)) {
return contents.getTintColor();
}
}
// water tinting if contains water or TE is missing
return BiomeColors.getAverageWaterColor(world, pos);
}

return -1;
}, InspirationsRecipes.cauldron);
}

@SubscribeEvent
Expand Down
116 changes: 0 additions & 116 deletions src/main/java/knightminer/inspirations/recipes/RecipesEvents.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/knightminer/inspirations/recipes/block/EnhancedCauldronBlock.java
View file
Expand Up @@ -75,7 +75,7 @@ public void handlePrecipitation(BlockState state, Level world, BlockPos pos, Pre
@Nullable
@Override
public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState pState, BlockEntityType<T> matchType) {
return BlockEntityHelper.castTicker(matchType, InspirationsRecipes.tileCauldron, level.isClientSide ? CauldronTileEntity.CLIENT_TICKER : CauldronTileEntity.SERVER_TICKER);
return BlockEntityHelper.castTicker(matchType, null/*InspirationsRecipes.tileCauldron*/, level.isClientSide ? CauldronTileEntity.CLIENT_TICKER : CauldronTileEntity.SERVER_TICKER);
}

/* TE behavior */
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/knightminer/inspirations/recipes/block/SmashingAnvilBlock.java
View file
@@ -1,6 +1,5 @@
package knightminer.inspirations.recipes.block;

import knightminer.inspirations.recipes.InspirationsRecipes;
import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.item.FallingBlockEntity;
import net.minecraft.world.level.Level;
Expand All @@ -22,11 +21,11 @@ public SmashingAnvilBlock(Block.Properties props) {
@Nullable
public static BlockState damage(BlockState state) {
Block block = state.getBlock();
if (block == Blocks.ANVIL || block == InspirationsRecipes.fullAnvil) {
return InspirationsRecipes.chippedAnvil.defaultBlockState().setValue(FACING, state.getValue(FACING));
if (block == Blocks.ANVIL /*|| block == InspirationsRecipes.fullAnvil*/) {
return /*InspirationsRecipes.chippedAnvil*/Blocks.CHIPPED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING));
} else {
if (block == Blocks.CHIPPED_ANVIL || block == InspirationsRecipes.chippedAnvil)
return InspirationsRecipes.damagedAnvil.defaultBlockState().setValue(FACING, state.getValue(FACING));
if (block == Blocks.CHIPPED_ANVIL /*|| block == InspirationsRecipes.chippedAnvil*/)
return /*InspirationsRecipes.damagedAnvil*/Blocks.DAMAGED_ANVIL.defaultBlockState().setValue(FACING, state.getValue(FACING));
else return null;
}
}
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/knightminer/inspirations/recipes/tileentity/CauldronTileEntity.java
View file
Expand Up @@ -13,7 +13,6 @@
import knightminer.inspirations.library.recipe.cauldron.recipe.ICauldronRecipe;
import knightminer.inspirations.library.recipe.cauldron.recipe.ICauldronTransform;
import knightminer.inspirations.library.recipe.cauldron.util.CauldronTemperature;
import knightminer.inspirations.recipes.InspirationsRecipes;
import knightminer.inspirations.recipes.block.EnhancedCauldronBlock;
import knightminer.inspirations.recipes.recipe.inventory.CauldronItemInventory;
import knightminer.inspirations.recipes.recipe.inventory.TileCauldronInventory;
Expand Down Expand Up @@ -118,15 +117,15 @@ public class CauldronTileEntity extends MantleBlockEntity {
* Creates a new cauldron with no block set
*/
public CauldronTileEntity(BlockPos pos, BlockState state) {
this(pos, state, InspirationsRecipes.cauldron);
this(pos, state, null);//InspirationsRecipes.cauldron);
}

/**
* Creates a new cauldron for the given block
* @param block Parent block
*/
public CauldronTileEntity(BlockPos pos, BlockState state, EnhancedCauldronBlock block) {
this(InspirationsRecipes.tileCauldron, pos, state, block);
this(null/*InspirationsRecipes.tileCauldron*/, pos, state, block);
}

/**
Expand Down

0 comments on commit 9424d81

Please sign in to comment.