lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run migration mappings

Browse source 
Everything is still broken, but at least we reduced the amount of errors by hundreds, if not thousands.
This commit is contained in:
Nicholas Ignoffo 2019-09-22 12:55:43 -07:00
parent 1caae69992
commit 4035d91151
484 changed files with 4924 additions and 4962 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java
View file

@ -5,7 +5,7 @@ import WayofTime.bloodmagic.altar.ComponentType;
import WayofTime.bloodmagic.util.BMLog;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.block.state.IBlockState;
import net.minecraft.block.BlockState;
import javax.annotation.Nonnull;
import java.util.List;
@ -17,7 +17,7 @@ public class BloodMagicAPI implements IBloodMagicAPI {
private final BloodMagicBlacklist blacklist;
private final BloodMagicRecipeRegistrar recipeRegistrar;
private final BloodMagicValueManager valueManager;
private final Multimap<ComponentType, IBlockState> altarComponents;
private final Multimap<ComponentType, BlockState> altarComponents;
public BloodMagicAPI() {
this.blacklist = new BloodMagicBlacklist();
@ -45,7 +45,7 @@ public class BloodMagicAPI implements IBloodMagicAPI {
}
@Override
public void registerAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) {
public void registerAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) {
ComponentType component = null;
for (ComponentType type : ComponentType.VALUES) {
if (type.name().equalsIgnoreCase(componentType)) {
@ -61,7 +61,7 @@ public class BloodMagicAPI implements IBloodMagicAPI {
}
@Override
public void unregisterAltarComponent(@Nonnull IBlockState state, @Nonnull String componentType) {
public void unregisterAltarComponent(@Nonnull BlockState state, @Nonnull String componentType) {
ComponentType component = null;
for (ComponentType type : ComponentType.VALUES) {
if (type.name().equalsIgnoreCase(componentType)) {
@ -77,7 +77,7 @@ public class BloodMagicAPI implements IBloodMagicAPI {
}
@Nonnull
public List<IBlockState> getComponentStates(ComponentType component) {
return (List<IBlockState>) altarComponents.get(component);
public List<BlockState> getComponentStates(ComponentType component) {
return (List<BlockState>) altarComponents.get(component);
}
}

26
src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java
View file

@ -5,7 +5,7 @@ import WayofTime.bloodmagic.util.BMLog;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.block.BlockState;
import net.minecraft.util.ResourceLocation;
import javax.annotation.Nonnull;
@ -13,10 +13,10 @@ import java.util.Set;
public class BloodMagicBlacklist implements IBloodMagicBlacklist {
private final Set<IBlockState> teleposer;
private final Set<BlockState> teleposer;
private final Set<ResourceLocation> teleposerEntities;
private final Set<IBlockState> transposition;
private final Set<IBlockState> greenGrove;
private final Set<BlockState> transposition;
private final Set<BlockState> greenGrove;
private final Set<ResourceLocation> sacrifice;
public BloodMagicBlacklist() {
@ -28,7 +28,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
}
@Override
public void addTeleposer(@Nonnull IBlockState state) {
public void addTeleposer(@Nonnull BlockState state) {
if (!teleposer.contains(state)) {
BMLog.API_VERBOSE.info("Blacklist: Added {} to the Teleposer blacklist.", state);
teleposer.add(state);
@ -36,7 +36,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
}
public void addTeleposer(@Nonnull Block block) {
for (IBlockState state : block.getBlockState().getValidStates())
for (BlockState state : block.getBlockState().getValidStates())
addTeleposer(state);
}
@ -49,7 +49,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
}
@Override
public void addTransposition(@Nonnull IBlockState state) {
public void addTransposition(@Nonnull BlockState state) {
if (!transposition.contains(state)) {
BMLog.API_VERBOSE.info("Blacklist: Added {} to the Transposition blacklist.", state);
transposition.add(state);
@ -57,12 +57,12 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
}
public void addTransposition(@Nonnull Block block) {
for (IBlockState state : block.getBlockState().getValidStates())
for (BlockState state : block.getBlockState().getValidStates())
addTransposition(state);
}
@Override
public void addGreenGrove(@Nonnull IBlockState state) {
public void addGreenGrove(@Nonnull BlockState state) {
if (!greenGrove.contains(state)) {
BMLog.API_VERBOSE.info("Blacklist: Added {} to the Green Grove blacklist.", state);
greenGrove.add(state);
@ -70,7 +70,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
}
public void addGreenGrove(@Nonnull Block block) {
for (IBlockState state : block.getBlockState().getValidStates())
for (BlockState state : block.getBlockState().getValidStates())
addGreenGrove(state);
}
@ -84,7 +84,7 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
// Internal use getters
public Set<IBlockState> getTeleposer() {
public Set<BlockState> getTeleposer() {
return ImmutableSet.copyOf(teleposer);
}
@ -92,11 +92,11 @@ public class BloodMagicBlacklist implements IBloodMagicBlacklist {
return ImmutableSet.copyOf(teleposerEntities);
}
public Set<IBlockState> getTransposition() {
public Set<BlockState> getTransposition() {
return ImmutableSet.copyOf(transposition);
}
public Set<IBlockState> getGreenGrove() {
public Set<BlockState> getGreenGrove() {
return ImmutableSet.copyOf(greenGrove);
}

2
src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java
View file

@ -17,7 +17,7 @@ import WayofTime.bloodmagic.incense.EnumTranquilityType;
import WayofTime.bloodmagic.incense.TranquilityStack;
import WayofTime.bloodmagic.util.StateUtil;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.block.Blocks;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.registry.EntityEntry;
import net.minecraftforge.fml.common.registry.ForgeRegistries;

10
src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicValueManager.java
View file

@ -7,7 +7,7 @@ import WayofTime.bloodmagic.util.BMLog;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.block.BlockState;
import net.minecraft.util.ResourceLocation;
import javax.annotation.Nonnull;
@ -16,7 +16,7 @@ import java.util.Map;
public class BloodMagicValueManager implements IBloodMagicValueManager {
private final Map<ResourceLocation, Integer> sacrificial;
private final Map<IBlockState, TranquilityStack> tranquility;
private final Map<BlockState, TranquilityStack> tranquility;
public BloodMagicValueManager() {
this.sacrificial = Maps.newHashMap();
@ -30,7 +30,7 @@ public class BloodMagicValueManager implements IBloodMagicValueManager {
}
@Override
public void setTranquility(@Nonnull IBlockState state, @Nonnull String tranquilityType, double value) {
public void setTranquility(@Nonnull BlockState state, @Nonnull String tranquilityType, double value) {
EnumTranquilityType tranquility = null;
for (EnumTranquilityType type : EnumTranquilityType.values()) {
if (type.name().equalsIgnoreCase(tranquilityType)) {
@ -46,7 +46,7 @@ public class BloodMagicValueManager implements IBloodMagicValueManager {
}
public void setTranquility(Block block, TranquilityStack tranquilityStack) {
for (IBlockState state : block.getBlockState().getValidStates()) {
for (BlockState state : block.getBlockState().getValidStates()) {
BMLog.API_VERBOSE.info("Value Manager: Set tranquility value of {} to {} @ {}", state, tranquilityStack.type, tranquilityStack.value);
tranquility.put(state, tranquilityStack);
}
@ -56,7 +56,7 @@ public class BloodMagicValueManager implements IBloodMagicValueManager {
return ImmutableMap.copyOf(sacrificial);
}
public Map<IBlockState, TranquilityStack> getTranquility() {
public Map<BlockState, TranquilityStack> getTranquility() {
return ImmutableMap.copyOf(tranquility);
}
}