Skip to content

Commit

Permalink
initial 1.16.3 port
Browse files Browse the repository at this point in the history 
Signed-off-by: Marty E. Plummer <[email protected]>
  • Loading branch information
@hanetzer @KnightMiner
hanetzer authored and KnightMiner committed Sep 23, 2020
1 parent 1e1a236 commit cdea85e
Show file tree
Hide file tree
Showing 46 changed files with 227 additions and 1,608 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@ options.txt
/banned-players.json
/ops.json
/whitelist.json
src/generated/resources/.cache/cache
10 changes: 7 additions & 3 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ dependencies {
compile fg.deobf("slimeknights.mantle:Mantle:${minecraft_version}-${mantle_version}")

// compile against the JEI API but do not include it at runtime
compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
compileOnly fg.deobf("mezz.jei:jei-1.16.2:${jei_version}:api")
// at runtime, use the full JEI jar
runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
runtimeOnly fg.deobf("mezz.jei:jei-1.16.2:${jei_version}")

compile fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_base_version}:${minecraft_base_version}-${probe_version}")

Expand All @@ -216,7 +216,11 @@ processResources {
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'

expand 'version': artifact_version, 'MCversion': minecraft_version, 'forge_version': forge_version_min
expand 'version': artifact_version,
'minecraft_version_min': minecraft_version_min, 'minecraft_version_max': minecraft_version_max,
'forge_version_min': forge_version_min, 'forge_version_max': forge_version_max,
'javafml_min': javafml_min, 'javafml_max': javafml_max,
'mantle_version': mantle_version
}

from(sourceSets.main.resources.srcDirs) {
Expand Down
19 changes: 12 additions & 7 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,23 @@ org.gradle.daemon=false
mod_version=3.0.1

# Minecraft Version Information
minecraft_version=1.16.1
minecraft_base_version=1.16
minecraft_version_min=1.16.2
minecraft_version=1.16.3
minecraft_version_max=1.17

# Forge Version Information
forge_version=32.0.108
forge_version_min=32.0.108
javafml_min=33.0
javafml_max=35.0
forge_version_min=33.0.0
forge_version=34.0.13
forge_version_max=35.0.0

# Mappings Information
mappings_version=20200723-1.16.1
mappings_version=20200916-1.16.2

# Build Dependencies
mantle_version=1.6.28
jei_version=7.0.+
mantle_version=1.6.38
jei_version=7.1.+
hwyla_version=1.10.10-B77
probe_version=3.0.1-beta-4
probe_version=3.0.2-beta-5
1,404 changes: 0 additions & 1,404 deletions src/generated/resources/.cache/cache
View file

This file was deleted.

175 changes: 88 additions & 87 deletions src/main/java/slimeknights/tconstruct/common/TinkerTags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,130 +7,131 @@
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.EntityTypeTags;
import net.minecraft.tags.FluidTags;
import net.minecraft.tags.ITag.INamedTag;
import net.minecraft.tags.ItemTags;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.Tags.IOptionalNamedTag;
import slimeknights.tconstruct.library.Util;

public class TinkerTags {

public static class Blocks {

public static final INamedTag<Block> CONGEALED_SLIME = tag("congealed_slime");
public static final INamedTag<Block> SLIMY_LOGS = tag("slimy_logs");
public static final INamedTag<Block> SLIMY_LEAVES = tag("slimy_leaves");
public static final INamedTag<Block> SLIMY_SAPLINGS = tag("slimy_saplings");
public static final IOptionalNamedTag<Block> CONGEALED_SLIME = tag("congealed_slime");
public static final IOptionalNamedTag<Block> SLIMY_LOGS = tag("slimy_logs");
public static final IOptionalNamedTag<Block> SLIMY_LEAVES = tag("slimy_leaves");
public static final IOptionalNamedTag<Block> SLIMY_SAPLINGS = tag("slimy_saplings");

public static final INamedTag<Block> ORES_COBALT = forgeTag("ores/cobalt");
public static final INamedTag<Block> ORES_ARDITE = forgeTag("ores/ardite");
public static final INamedTag<Block> ORES_COPPER = forgeTag("ores/copper");
public static final IOptionalNamedTag<Block> ORES_COBALT = forgeTag("ores/cobalt");
public static final IOptionalNamedTag<Block> ORES_ARDITE = forgeTag("ores/ardite");
public static final IOptionalNamedTag<Block> ORES_COPPER = forgeTag("ores/copper");

public static final INamedTag<Block> STORAGE_BLOCKS_COBALT = forgeTag("storage_blocks/cobalt");
public static final INamedTag<Block> STORAGE_BLOCKS_ARDITE = forgeTag("storage_blocks/ardite");
public static final INamedTag<Block> STORAGE_BLOCKS_MANYULLYN = forgeTag("storage_blocks/manyullyn");
public static final INamedTag<Block> STORAGE_BLOCKS_KNIGHTSLIME = forgeTag("storage_blocks/knightslime");
public static final INamedTag<Block> STORAGE_BLOCKS_PIG_IRON = forgeTag("storage_blocks/pig_iron");
public static final INamedTag<Block> STORAGE_BLOCKS_COPPER = forgeTag("storage_blocks/copper");
public static final INamedTag<Block> STORAGE_BLOCKS_ROSE_GOLD = forgeTag("storage_blocks/rose_gold");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_COBALT = forgeTag("storage_blocks/cobalt");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_ARDITE = forgeTag("storage_blocks/ardite");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_MANYULLYN = forgeTag("storage_blocks/manyullyn");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_KNIGHTSLIME = forgeTag("storage_blocks/knightslime");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_PIG_IRON = forgeTag("storage_blocks/pig_iron");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_COPPER = forgeTag("storage_blocks/copper");
public static final IOptionalNamedTag<Block> STORAGE_BLOCKS_ROSE_GOLD = forgeTag("storage_blocks/rose_gold");

public static final INamedTag<Block> SEARED_BLOCKS = tag("seared_blocks");
public static final INamedTag<Block> SMOOTH_SEARED_BLOCKS = tag("smooth_seared_blocks");
public static final INamedTag<Block> SEARED_BRICKS = tag("seared_bricks");
public static final IOptionalNamedTag<Block> SEARED_BLOCKS = tag("seared_blocks");
public static final IOptionalNamedTag<Block> SMOOTH_SEARED_BLOCKS = tag("smooth_seared_blocks");
public static final IOptionalNamedTag<Block> SEARED_BRICKS = tag("seared_bricks");


private static INamedTag<Block> tag(String name) {
return BlockTags.makeWrapperTag(Util.resource(name));
private static IOptionalNamedTag<Block> tag(String name) {
return BlockTags.createOptional(Util.getResource(name));
}

private static INamedTag<Block> forgeTag(String name) {
return BlockTags.makeWrapperTag("forge:" + name);
private static IOptionalNamedTag<Block> forgeTag(String name) {
return BlockTags.createOptional(new ResourceLocation("forge", name));
}
}

public static class Items {

public static final INamedTag<Item> CONGEALED_SLIME = tag("congealed_slime");
public static final INamedTag<Item> SLIMY_LOGS = tag("slimy_logs");
public static final INamedTag<Item> SLIMY_LEAVES = tag("slimy_leaves");
public static final INamedTag<Item> SLIMY_SAPLINGS = tag("slimy_saplings");

public static final INamedTag<Item> ORES_COBALT = forgeTag("ores/cobalt");
public static final INamedTag<Item> ORES_ARDITE = forgeTag("ores/ardite");
public static final INamedTag<Item> ORES_COPPER = forgeTag("ores/copper");

public static final INamedTag<Item> STORAGE_BLOCKS_COBALT = forgeTag("storage_blocks/cobalt");
public static final INamedTag<Item> STORAGE_BLOCKS_ARDITE = forgeTag("storage_blocks/ardite");
public static final INamedTag<Item> STORAGE_BLOCKS_MANYULLYN = forgeTag("storage_blocks/manyullyn");
public static final INamedTag<Item> STORAGE_BLOCKS_KNIGHTSLIME = forgeTag("storage_blocks/knightslime");
public static final INamedTag<Item> STORAGE_BLOCKS_PIG_IRON = forgeTag("storage_blocks/pig_iron");
public static final INamedTag<Item> STORAGE_BLOCKS_COPPER = forgeTag("storage_blocks/copper");
public static final INamedTag<Item> STORAGE_BLOCKS_ROSE_GOLD = forgeTag("storage_blocks/rose_gold");

public static final INamedTag<Item> SEARED_BLOCKS = tag("seared_blocks");
public static final INamedTag<Item> SMOOTH_SEARED_BLOCKS = tag("smooth_seared_blocks");

public static final INamedTag<Item> SEARED_BRICKS = tag("seared_bricks");
public static final INamedTag<Item> GREEN_SLIMEBALL = forgeTag("slimeball/green");
public static final INamedTag<Item> BLUE_SLIMEBALL = forgeTag("slimeball/blue");
public static final INamedTag<Item> PURPLE_SLIMEBALL = forgeTag("slimeball/purple");
public static final INamedTag<Item> BLOOD_SLIMEBALL = forgeTag("slimeball/blood");

public static final INamedTag<Item> MAGMA_SLIMEBALL = forgeTag("slimeball/magma");
public static final INamedTag<Item> INGOTS_ARDITE = forgeTag("ingots/ardite");
public static final INamedTag<Item> INGOTS_COBALT = forgeTag("ingots/cobalt");
public static final INamedTag<Item> INGOTS_MANYULLYN = forgeTag("ingots/manyullyn");
public static final INamedTag<Item> INGOTS_KNIGHTSLIME = forgeTag("ingots/knightslime");
public static final INamedTag<Item> INGOTS_PIG_IRON = forgeTag("ingots/pig_iron");
public static final INamedTag<Item> INGOTS_COPPER = forgeTag("ingots/copper");
public static final INamedTag<Item> INGOTS_ROSE_GOLD = forgeTag("ingots/rose_gold");

public static final INamedTag<Item> NUGGETS_COBALT = forgeTag("nuggets/cobalt");
public static final INamedTag<Item> NUGGETS_ARDITE = forgeTag("nuggets/ardite");
public static final INamedTag<Item> NUGGETS_MANYULLYN = forgeTag("nuggets/manyullyn");
public static final INamedTag<Item> NUGGETS_KNIGHTSLIME = forgeTag("nuggets/knightslime");
public static final INamedTag<Item> NUGGETS_PIG_IRON = forgeTag("nuggets/pig_iron");
public static final INamedTag<Item> NUGGETS_COPPER = forgeTag("nuggets/copper");
public static final INamedTag<Item> NUGGETS_ROSE_GOLD = forgeTag("nuggets/rose_gold");

public static final INamedTag<Item> CASTS = tag("casts");

public static final INamedTag<Item> RODS_STONE = forgeTag("rods/stone");


private static INamedTag<Item> tag(String name) {
return ItemTags.makeWrapperTag(Util.resource(name));
public static final IOptionalNamedTag<Item> CONGEALED_SLIME = tag("congealed_slime");
public static final IOptionalNamedTag<Item> SLIMY_LOGS = tag("slimy_logs");
public static final IOptionalNamedTag<Item> SLIMY_LEAVES = tag("slimy_leaves");
public static final IOptionalNamedTag<Item> SLIMY_SAPLINGS = tag("slimy_saplings");

public static final IOptionalNamedTag<Item> ORES_COBALT = forgeTag("ores/cobalt");
public static final IOptionalNamedTag<Item> ORES_ARDITE = forgeTag("ores/ardite");
public static final IOptionalNamedTag<Item> ORES_COPPER = forgeTag("ores/copper");

public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_COBALT = forgeTag("storage_blocks/cobalt");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_ARDITE = forgeTag("storage_blocks/ardite");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_MANYULLYN = forgeTag("storage_blocks/manyullyn");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_KNIGHTSLIME = forgeTag("storage_blocks/knightslime");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_PIG_IRON = forgeTag("storage_blocks/pig_iron");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_COPPER = forgeTag("storage_blocks/copper");
public static final IOptionalNamedTag<Item> STORAGE_BLOCKS_ROSE_GOLD = forgeTag("storage_blocks/rose_gold");

public static final IOptionalNamedTag<Item> SEARED_BLOCKS = tag("seared_blocks");
public static final IOptionalNamedTag<Item> SMOOTH_SEARED_BLOCKS = tag("smooth_seared_blocks");

public static final IOptionalNamedTag<Item> SEARED_BRICKS = tag("seared_bricks");
public static final IOptionalNamedTag<Item> GREEN_SLIMEBALL = forgeTag("slimeball/green");
public static final IOptionalNamedTag<Item> BLUE_SLIMEBALL = forgeTag("slimeball/blue");
public static final IOptionalNamedTag<Item> PURPLE_SLIMEBALL = forgeTag("slimeball/purple");
public static final IOptionalNamedTag<Item> BLOOD_SLIMEBALL = forgeTag("slimeball/blood");

public static final IOptionalNamedTag<Item> MAGMA_SLIMEBALL = forgeTag("slimeball/magma");
public static final IOptionalNamedTag<Item> INGOTS_ARDITE = forgeTag("ingots/ardite");
public static final IOptionalNamedTag<Item> INGOTS_COBALT = forgeTag("ingots/cobalt");
public static final IOptionalNamedTag<Item> INGOTS_MANYULLYN = forgeTag("ingots/manyullyn");
public static final IOptionalNamedTag<Item> INGOTS_KNIGHTSLIME = forgeTag("ingots/knightslime");
public static final IOptionalNamedTag<Item> INGOTS_PIG_IRON = forgeTag("ingots/pig_iron");
public static final IOptionalNamedTag<Item> INGOTS_COPPER = forgeTag("ingots/copper");
public static final IOptionalNamedTag<Item> INGOTS_ROSE_GOLD = forgeTag("ingots/rose_gold");

public static final IOptionalNamedTag<Item> NUGGETS_COBALT = forgeTag("nuggets/cobalt");
public static final IOptionalNamedTag<Item> NUGGETS_ARDITE = forgeTag("nuggets/ardite");
public static final IOptionalNamedTag<Item> NUGGETS_MANYULLYN = forgeTag("nuggets/manyullyn");
public static final IOptionalNamedTag<Item> NUGGETS_KNIGHTSLIME = forgeTag("nuggets/knightslime");
public static final IOptionalNamedTag<Item> NUGGETS_PIG_IRON = forgeTag("nuggets/pig_iron");
public static final IOptionalNamedTag<Item> NUGGETS_COPPER = forgeTag("nuggets/copper");
public static final IOptionalNamedTag<Item> NUGGETS_ROSE_GOLD = forgeTag("nuggets/rose_gold");

public static final IOptionalNamedTag<Item> CASTS = tag("casts");

public static final IOptionalNamedTag<Item> RODS_STONE = forgeTag("rods/stone");


private static IOptionalNamedTag<Item> tag(String name) {
return ItemTags.createOptional(Util.getResource(name));
}

private static INamedTag<Item> forgeTag(String name) {
return ItemTags.makeWrapperTag("forge:" + name);
private static IOptionalNamedTag<Item> forgeTag(String name) {
return ItemTags.createOptional(new ResourceLocation("forge", name));
}
}

public static class Fluids {

public static final INamedTag<Fluid> BLUE_SLIME = tag("blue_slime");
public static final INamedTag<Fluid> PURPLE_SLIME = tag("purple_slime");
public static final INamedTag<Fluid> SLIME = tag("slime");
public static final INamedTag<Fluid> MILK = forgeTag("milk");
public static final IOptionalNamedTag<Fluid> BLUE_SLIME = tag("blue_slime");
public static final IOptionalNamedTag<Fluid> PURPLE_SLIME = tag("purple_slime");
public static final IOptionalNamedTag<Fluid> SLIME = tag("slime");
public static final IOptionalNamedTag<Fluid> MILK = forgeTag("milk");

private static INamedTag<Fluid> tag(String name) {
return FluidTags.makeWrapperTag(Util.resource(name));
private static IOptionalNamedTag<Fluid> tag(String name) {
return FluidTags.createOptional(Util.getResource(name));
}

private static INamedTag<Fluid> forgeTag(String name) {
return FluidTags.makeWrapperTag("forge:" + name);
private static IOptionalNamedTag<Fluid> forgeTag(String name) {
return FluidTags.createOptional(new ResourceLocation("forge", name));
}
}

public static class EntityTypes {

public static final INamedTag<EntityType<?>> SLIMES = forgeTag("slimes");
public static final IOptionalNamedTag<EntityType<?>> SLIMES = forgeTag("slimes");

private static INamedTag<EntityType<?>> tag(String name) {
return EntityTypeTags.func_232896_a_(Util.resource(name));
private static IOptionalNamedTag<EntityType<?>> tag(String name) {
return EntityTypeTags.createOptional(Util.getResource(name));
}

private static INamedTag<EntityType<?>> forgeTag(String name) {
return EntityTypeTags.func_232896_a_("forge:" + name);
private static IOptionalNamedTag<EntityType<?>> forgeTag(String name) {
return EntityTypeTags.createOptional(new ResourceLocation("forge", name));
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/slimeknights/tconstruct/common/data/TConstructLootTableProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ protected List<Pair<Supplier<Consumer<BiConsumer<ResourceLocation, LootTable.Bui

@Override
protected void validate(Map<ResourceLocation,LootTable> map, ValidationTracker validationtracker) {
map.forEach((loc, table) -> LootTableManager.func_227508_a_(validationtracker, loc, table));
map.forEach((loc, table) -> LootTableManager.validateLootTable(validationtracker, loc, table));
// Remove vanilla's tables, which we also loaded so we can redirect stuff to them.
// This ensures the remaining generator logic doesn't write those to files.
map.keySet().removeIf((loc) -> !loc.getNamespace().equals(TConstruct.modID));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/slimeknights/tconstruct/debug/ToolDebugScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ protected void init() {
public void render(MatrixStack matrices, int p_render_1_, int p_render_2_, float p_render_3_) {
this.renderBackground(matrices);
super.render(matrices, p_render_1_, p_render_2_, p_render_3_);
this.func_230459_a_(matrices, p_render_1_, p_render_2_);
this.renderHoveredTooltip(matrices, p_render_1_, p_render_2_);
//GlStateManager.disableLighting();
//GlStateManager.disableBlend();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/slimeknights/tconstruct/gadgets/Exploder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ private void explodeBlock(BlockPos blockpos) {

if (!this.world.isRemote && blockstate.canDropFromExplosion(this.world, blockpos, this.explosion)) {
TileEntity tileentity = blockstate.hasTileEntity() ? this.world.getTileEntity(blockpos) : null;
LootContext.Builder builder = (new LootContext.Builder((ServerWorld) this.world)).withRandom(this.world.rand).withParameter(LootParameters.POSITION, blockpos).withParameter(LootParameters.TOOL, ItemStack.EMPTY).withNullableParameter(LootParameters.BLOCK_ENTITY, tileentity);
LootContext.Builder builder = (new LootContext.Builder((ServerWorld) this.world)).withRandom(this.world.rand).withParameter(LootParameters.field_237457_g_, Vector3d.copyCentered(blockpos)).withParameter(LootParameters.TOOL, ItemStack.EMPTY).withNullableParameter(LootParameters.BLOCK_ENTITY, tileentity);

this.droppedItems.addAll(blockstate.getDrops(builder));
}
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/slimeknights/tconstruct/gadgets/entity/EFLNExplosion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.Explosion;
import net.minecraft.world.IExplosionContext;
import net.minecraft.world.ExplosionContext;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;

Expand All @@ -29,7 +30,7 @@ public class EFLNExplosion extends Explosion {

protected ImmutableSet<BlockPos> affectedBlockPositionsInternal;

public EFLNExplosion(World world, @Nullable Entity entity, @Nullable DamageSource damage, @Nullable IExplosionContext context, double x, double y, double z, float size, boolean causesFire, Explosion.Mode mode) {
public EFLNExplosion(World world, @Nullable Entity entity, @Nullable DamageSource damage, @Nullable ExplosionContext context, double x, double y, double z, float size, boolean causesFire, Explosion.Mode mode) {
super(world, entity, damage, context, x, y, z, size, causesFire, mode);
}

Expand Down Expand Up @@ -101,7 +102,7 @@ public void doExplosionB(boolean spawnParticles) {

if (blockstate.canDropFromExplosion(this.world, blockpos, this) && this.world instanceof ServerWorld) {
TileEntity tileentity = blockstate.hasTileEntity() ? this.world.getTileEntity(blockpos) : null;
LootContext.Builder builder = (new LootContext.Builder((ServerWorld) this.world)).withRandom(this.world.rand).withParameter(LootParameters.POSITION, blockpos).withParameter(LootParameters.TOOL, ItemStack.EMPTY).withNullableParameter(LootParameters.BLOCK_ENTITY, tileentity).withNullableParameter(LootParameters.THIS_ENTITY, this.exploder);
LootContext.Builder builder = (new LootContext.Builder((ServerWorld) this.world)).withRandom(this.world.rand).withParameter(LootParameters.field_237457_g_, Vector3d.copyCentered(blockpos)).withParameter(LootParameters.TOOL, ItemStack.EMPTY).withNullableParameter(LootParameters.BLOCK_ENTITY, tileentity).withNullableParameter(LootParameters.THIS_ENTITY, this.exploder);

if (this.mode == Explosion.Mode.DESTROY) {
builder.withParameter(LootParameters.EXPLOSION_RADIUS, this.size);
Expand Down
Loading

0 comments on commit cdea85e

Please sign in to comment.